summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorMikael Holmen <mikael.holmen@ericsson.com>2019-04-11 06:57:12 +0000
committerMikael Holmen <mikael.holmen@ericsson.com>2019-04-11 06:57:12 +0000
commit58c080a3b12d0c7b4717f83370631a4f38283041 (patch)
tree64be32b2e4bc7d5f16ac435032e1176662be2c77 /clang/lib/CodeGen
parent1b01f9728f9b03f7870a20b61f4690eaf866885e (diff)
downloadbcm5719-llvm-58c080a3b12d0c7b4717f83370631a4f38283041.tar.gz
bcm5719-llvm-58c080a3b12d0c7b4717f83370631a4f38283041.zip
Add { } to silence compiler warning [NFC]
At least clang 3.6 warns on the original code: ../tools/clang/lib/CodeGen/CGNonTrivialStruct.cpp:829:34: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces] return std::array<Address, 1>({Address(nullptr, CharUnits::Zero())}); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ { } ../tools/clang/lib/CodeGen/CGNonTrivialStruct.cpp:833:34: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces] return std::array<Address, 2>({Address(nullptr, CharUnits::Zero()), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 errors generated. llvm-svn: 358152
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/CGNonTrivialStruct.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGNonTrivialStruct.cpp b/clang/lib/CodeGen/CGNonTrivialStruct.cpp
index bc34727731d..caf62d2ac93 100644
--- a/clang/lib/CodeGen/CGNonTrivialStruct.cpp
+++ b/clang/lib/CodeGen/CGNonTrivialStruct.cpp
@@ -826,12 +826,12 @@ static void callSpecialFunction(G &&Gen, StringRef FuncName, QualType QT,
template <size_t N> std::array<Address, N> createNullAddressArray();
template <> std::array<Address, 1> createNullAddressArray() {
- return std::array<Address, 1>({Address(nullptr, CharUnits::Zero())});
+ return std::array<Address, 1>({{Address(nullptr, CharUnits::Zero())}});
}
template <> std::array<Address, 2> createNullAddressArray() {
- return std::array<Address, 2>({Address(nullptr, CharUnits::Zero()),
- Address(nullptr, CharUnits::Zero())});
+ return std::array<Address, 2>({{Address(nullptr, CharUnits::Zero()),
+ Address(nullptr, CharUnits::Zero())}});
}
template <class G, size_t N>
OpenPOWER on IntegriCloud