Use fix<> API to specify compile-time reshaped sizes.

1 files changed, 15 insertions, 15 deletions

diff --git a/test/reshape.cpp b/test/reshape.cpp
index e2c045aa6..37b6a007f 100644
--- a/test/reshape.cpp
+++ b/test/reshape.cpp
@@ -26,25 +26,25 @@ void reshape_all_size(MatType m)
   VERIFY_IS_EQUAL((m.reshaped(16,  1)), MapMat(m.data(), 16,  1));
 
   // static
-  VERIFY_IS_EQUAL((m.template reshaped< 1, 16>()), MapMat(m.data(),  1, 16));
-  VERIFY_IS_EQUAL((m.template reshaped< 2,  8>()), MapMat(m.data(),  2,  8));
-  VERIFY_IS_EQUAL((m.template reshaped< 4,  4>()), MapMat(m.data(),  4,  4));
-  VERIFY_IS_EQUAL((m.template reshaped< 8,  2>()), MapMat(m.data(),  8,  2));
-  VERIFY_IS_EQUAL((m.template reshaped<16,  1>()), MapMat(m.data(), 16,  1));
+  VERIFY_IS_EQUAL(m.reshaped(fix< 1>, fix<16>), MapMat(m.data(),  1, 16));
+  VERIFY_IS_EQUAL(m.reshaped(fix< 2>, fix< 8>), MapMat(m.data(),  2,  8));
+  VERIFY_IS_EQUAL(m.reshaped(fix< 4>, fix< 4>), MapMat(m.data(),  4,  4));
+  VERIFY_IS_EQUAL(m.reshaped(fix< 8>, fix< 2>), MapMat(m.data(),  8,  2));
+  VERIFY_IS_EQUAL(m.reshaped(fix<16>, fix< 1>), MapMat(m.data(), 16,  1));
 
   // reshape chain
   VERIFY_IS_EQUAL(
     (m
-     .         reshaped( 1, 16)
-     .template reshaped< 2,  8>()
-     .         reshaped(16,  1)
-     .template reshaped< 8,  2>()
-     .         reshaped( 2,  8)
-     .template reshaped< 1, 16>()
-     .         reshaped( 4,  4)
-     .template reshaped<16,  1>()
-     .         reshaped( 8,  2)
-     .template reshaped< 4,  4>()
+     .reshaped( 1, 16)
+     .reshaped(fix< 2>,fix< 8>)
+     .reshaped(16,  1)
+     .reshaped(fix< 8>,fix< 2>)
+     .reshaped( 2,  8)
+     .reshaped(fix< 1>,fix<16>)
+     .reshaped( 4,  4)
+     .reshaped(fix<16>,fix< 1>)
+     .reshaped( 8,  2)
+     .reshaped(fix< 4>,fix< 4>)
     ),
     MapMat(m.data(), 4,  4)
   );