unit tests also test for compatibility with fixed size C arrays (in a…

…ddition to several other array types)
jewettaij · Jan 31, 2020 · a2eacf4 · a2eacf4
1 parent cc5ba16
commit a2eacf4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,6 +38,9 @@ matrix:
         #- now test again using array<array<double,5>,5>
         - g++ -g -O0 -DUSE_ARRAY_OF_ARRAY -I../include -o test_jacobi test.cpp
         - valgrind --leak-check=yes --error-exitcode=1 ./test_jacobi 5 10 1e-09 1e+09
+        #- now test again using double (*)[5]
+        - g++ -g -O0 -DUSE_C_FIXED_SIZE_ARRAYS -I../include -o test_jacobi test.cpp
+        - valgrind --leak-check=yes --error-exitcode=1 ./test_jacobi 5 10 1e-09 1e+09
         - cd ../
 
     - language: cpp
@@ -72,5 +75,8 @@ matrix:
         #- now test again using array<array<double,5>,5>
         - clang++ -g -O0 -DUSE_ARRAY_OF_ARRAY -I../include -o test_jacobi test.cpp
         - valgrind --leak-check=yes --error-exitcode=1 ./test_jacobi 5 10 1e-09 1e+09
+        #- now test again using double (*)[5]
+        - clang++ -g -O0 -DUSE_C_FIXED_SIZE_ARRAYS -I../include -o test_jacobi test.cpp
+        - valgrind --leak-check=yes --error-exitcode=1 ./test_jacobi 5 10 1e-09 1e+09
         - cd ../
 
diff --git a/tests/test.cpp b/tests/test.cpp
@@ -268,7 +268,7 @@ void GenRandSymm(Matrix M,       //<! store the matrix here
   #elif defined USE_ARRAY_OF_ARRAYS
   mmult<array<array<Scalar,NF>,NF>&, array<array<Scalar,NF>,NF>&>
   #elif defined USE_C_FIXED_SIZE_ARRAYS
-  mmult<Scalar *[NF], Scalar *[NF]>
+  mmult<Scalar (*)[NF], Scalar (*)[NF]>
   #else
   mmult<Scalar**, Scalar const *const *>
   #endif
@@ -287,7 +287,7 @@ void GenRandSymm(Matrix M,       //<! store the matrix here
   #elif defined USE_ARRAY_OF_ARRAYS
   mmult<array<array<Scalar,NF>,NF>&, array<array<Scalar,NF>,NF>&>
   #elif defined USE_C_FIXED_SIZE_ARRAYS
-  mmult<Scalar *[NF], Scalar *[NF]>
+  mmult<Scalar (*)[NF], Scalar (*)[NF]>
   #else
   mmult<Scalar**, Scalar const *const *>
   #endif
@@ -368,7 +368,7 @@ void TestJacobi(int n, //<! matrix size
   n = NF;
   cout << "Testing C fixed size arrays.\n"
     "(Ignoring first argument, and setting matrix size to " << n << ")" << endl;
-  Jacobi<Scalar, Scalar*, Scalar *[NF], Scalar *[NF]> ecalc(n);
+  Jacobi<Scalar, Scalar*, Scalar (*)[NF], Scalar (*)[NF]> ecalc(n);
   // allocate the matrix, eigenvalues, eigenvectors
   Scalar M[NF][NF];
   Scalar evects[NF][NF];
@@ -420,7 +420,7 @@ void TestJacobi(int n, //<! matrix size
     #elif defined USE_ARRAY_OF_ARRAYS
     GenRandSymm<Scalar, array<Scalar,NF>&, array<array<Scalar,NF>,NF>&>
     #elif defined USE_C_FIXED_SIZE_ARRAYS
-    GenRandSymm<Scalar, Scalar*, Scalar *[NF]>
+    GenRandSymm<Scalar, Scalar*, Scalar (*)[NF]>
     #else
     GenRandSymm<Scalar, Scalar*, Scalar**>
     #endif
@@ -442,7 +442,7 @@ void TestJacobi(int n, //<! matrix size
     #elif defined USE_ARRAY_OF_ARRAYS
     SortRows<Scalar, array<Scalar,NF>&, array<array<Scalar,NF>,NF>&>
     #elif defined USE_C_FIXED_SIZE_ARRAYS
-    SortRows<Scalar, Scalar*, Scalar *[NF]>
+    SortRows<Scalar, Scalar*, Scalar (*)[NF]>
     #else
     SortRows<Scalar, Scalar*, Scalar**>
     #endif