ADT/PointerIntPairTest.cpp: Appease msc17.

[oota-llvm.git] / unittests / ADT / VariadicFunctionTest.cpp

diff --git a/unittests/ADT/VariadicFunctionTest.cpp b/unittests/ADT/VariadicFunctionTest.cpp
index 8e6f5b48cb6f1a24b2fa7f0c4965c0c7d592f6c2..cde31205966cfcba6ba0ab1f3218bd6f6443b843 100644 (file)
--- a/unittests/ADT/VariadicFunctionTest.cpp
+++ b/unittests/ADT/VariadicFunctionTest.cpp
@@ -16,13 +16,13 @@ namespace {
 
 // Defines a variadic function StringCat() to join strings.
 // StringCat()'s arguments and return value have class types.
-std::string StringCatImpl(ArrayRef<const std::string*> Args) {
+std::string StringCatImpl(ArrayRef<const std::string *> Args) {
   std::string S;
   for (unsigned i = 0, e = Args.size(); i < e; ++i)
     S += *Args[i];
   return S;
 }
-const VariadicFunction<std::string, std::string, StringCatImpl> StringCat;
+const VariadicFunction<std::string, std::string, StringCatImpl> StringCat = {};
 
 TEST(VariadicFunctionTest, WorksForClassTypes) {
   EXPECT_EQ("", StringCat());
@@ -39,13 +39,13 @@ TEST(VariadicFunctionTest, WorksForClassTypes) {
 // have primitive types.
 // The return type of SumImp() is deliberately different from its
 // argument type, as we want to test that this works.
-long SumImpl(ArrayRef<const int*> Args) {
+long SumImpl(ArrayRef<const int *> Args) {
   long Result = 0;
   for (unsigned i = 0, e = Args.size(); i < e; ++i)
     Result += *Args[i];
   return Result;
 }
-const VariadicFunction<long, int, SumImpl> Sum;
+const VariadicFunction<long, int, SumImpl> Sum = {};
 
 TEST(VariadicFunctionTest, WorksForPrimitiveTypes) {
   EXPECT_EQ(0, Sum());
@@ -56,7 +56,7 @@ TEST(VariadicFunctionTest, WorksForPrimitiveTypes) {
 
 // Appends an array of strings to dest and returns the number of
 // characters appended.
-int StringAppendImpl(std::string* Dest, ArrayRef<const std::string*> Args) {
+int StringAppendImpl(std::string *Dest, ArrayRef<const std::string *> Args) {
   int Chars = 0;
   for (unsigned i = 0, e = Args.size(); i < e; ++i) {
     Chars += Args[i]->size();
@@ -64,8 +64,8 @@ int StringAppendImpl(std::string* Dest, ArrayRef<const std::string*> Args) {
   }
   return Chars;
 }
-const VariadicFunction1<int, std::string*, std::string,
-                        StringAppendImpl> StringAppend;
+const VariadicFunction1<int, std::string *, std::string,
+                        StringAppendImpl> StringAppend = {};
 
 TEST(VariadicFunction1Test, Works) {
   std::string S0("hi");
@@ -85,15 +85,15 @@ TEST(VariadicFunction1Test, Works) {
 // Counts how many optional arguments fall in the given range.
 // Returns the result in *num_in_range.  We make the return type void
 // as we want to test that VariadicFunction* can handle it.
-void CountInRangeImpl(int* NumInRange, int Low, int High,
-                      ArrayRef<const int*> Args) {
+void CountInRangeImpl(int *NumInRange, int Low, int High,
+                      ArrayRef<const int *> Args) {
   *NumInRange = 0;
   for (unsigned i = 0, e = Args.size(); i < e; ++i)
     if (Low <= *Args[i] && *Args[i] <= High)
       ++(*NumInRange);
 }
-const VariadicFunction3<void, int*, int, int, int,
-                        CountInRangeImpl> CountInRange;
+const VariadicFunction3<void, int *, int, int, int,
+                        CountInRangeImpl> CountInRange = {};
 
 TEST(VariadicFunction3Test, Works) {
   int N = -1;