Bug 823422: Make ipdl C++ unit tests compile again. r=jlebar

iaxat · Dec 20, 2012 · b24c21b · b24c21b
1 parent 5e7cf02
commit b24c21b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/ipc/ipdl/test/cxx/TestDataStructures.cpp b/ipc/ipdl/test/cxx/TestDataStructures.cpp
@@ -16,7 +16,7 @@ static const uint32_t nactors = 10;
 
 template<typename T>
 static void
-assert_arrays_equal(InfallibleTArray<T> a, InfallibleTArray<T> b)
+assert_arrays_equal(const InfallibleTArray<T>& a, const InfallibleTArray<T>& b)
 {
     test_assert(a == b, "arrays equal");
 }
@@ -179,13 +179,13 @@ bool TestDataStructuresParent::RecvTest6(
     IntDoubleArrays id1(i1[0]);
     test_assert(42 == id1.get_int(), "wrong value");
 
-    InfallibleTArray<int> i2a = i1[1].get_ArrayOfint();
+    InfallibleTArray<int> i2a(i1[1].get_ArrayOfint());
     test_assert(3 == i2a.Length(), "wrong length");
     test_assert(1 == i2a[0], "wrong value");
     test_assert(2 == i2a[1], "wrong value");
     test_assert(3 == i2a[2], "wrong value");
 
-    InfallibleTArray<double> i3a = i1[2].get_ArrayOfdouble();
+    InfallibleTArray<double> i3a(i1[2].get_ArrayOfdouble());
     test_assert(3 == i3a.Length(), "wrong length");
     test_assert(1.0 == i3a[0], "wrong value");
     test_assert(2.0 == i3a[1], "wrong value");
@@ -618,8 +618,8 @@ TestDataStructuresChild::Test6()
 
     test_assert(3 == o1.Length(), "wrong length");
     IntDoubleArrays od1(o1[0]);
-    InfallibleTArray<int> od2 = o1[1].get_ArrayOfint();
-    InfallibleTArray<double> od3 = o1[2].get_ArrayOfdouble();
+    InfallibleTArray<int> od2(o1[1].get_ArrayOfint());
+    InfallibleTArray<double> od3(o1[2].get_ArrayOfdouble());
 
     test_assert(42 == od1.get_int(), "wrong value");
     assert_arrays_equal(id2, od2);

diff --git a/ipc/ipdl/test/cxx/TestJSON.cpp b/ipc/ipdl/test/cxx/TestJSON.cpp
@@ -14,15 +14,12 @@ String(const char* const str)
     return NS_ConvertUTF8toUTF16(str);
 }
 
-static InfallibleTArray<JSONVariant>
-Array123()
+static void
+Array123(InfallibleTArray<JSONVariant>& a123)
 {
-    InfallibleTArray<JSONVariant> a123;
     a123.AppendElement(1);  a123.AppendElement(2);  a123.AppendElement(3);
 
     test_assert(a123 == a123, "operator== is broken");
-
-    return a123;
 }
 
 template<class HandleT>
@@ -55,7 +52,9 @@ MakeTestVariant(HandleT* handle)
 
     outer.AppendElement(handle);
 
-    outer.AppendElement(Array123());
+    InfallibleTArray<JSONVariant> tmp;
+    Array123(tmp);
+    outer.AppendElement(tmp);
 
     InfallibleTArray<KeyValue> obj;
     obj.AppendElement(KeyValue(String("undefined"), void_t()));
@@ -64,7 +63,9 @@ MakeTestVariant(HandleT* handle)
     obj.AppendElement(KeyValue(String("1.25"), 1.25));
     obj.AppendElement(KeyValue(String("string"), String("value")));
     obj.AppendElement(KeyValue(String("handle"), handle));
-    obj.AppendElement(KeyValue(String("array"), Array123()));
+    InfallibleTArray<JSONVariant> tmp2;
+    Array123(tmp2);
+    obj.AppendElement(KeyValue(String("array"), tmp2));
 
     outer.AppendElement(obj);