Merge pull request #4 from lagadic/feat_cpp11

Update samples with c++11 as minimal standard version
lagadic · Nov 1, 2023 · 9d311c1 · 9d311c1
2 parents 34cf6e6 + f5c8ec4
commit 9d311c1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 30 deletions.
diff --git a/core/sample-vpForceTwistMatrix-4.cpp b/core/sample-vpForceTwistMatrix-4.cpp
@@ -2,21 +2,19 @@
 
 int main()
 {
-#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
   {
-  vpTranslationVector stp(0.1, 0.2, 0.3);
-  vpRotationMatrix sRp( {0,  0, -1,
-                         0, -1,  0,
-                        -1,  0,  0} );
-  vpForceTwistMatrix sFp(stp, sRp);
-  std::cout << "sFp:\n" << sFp << std::endl;
+    vpTranslationVector stp(0.1, 0.2, 0.3);
+    vpRotationMatrix sRp({ 0,  0, -1,
+                           0, -1,  0,
+                          -1,  0,  0 });
+    vpForceTwistMatrix sFp(stp, sRp);
+    std::cout << "sFp:\n" << sFp << std::endl;
   }
   {
-  vpRotationMatrix sRp( {0,  0, -1,
-                         0, -1,  0,
-                        -1,  0,  0} );
-  vpForceTwistMatrix sFp(sRp);
-  std::cout << "sFp:\n" << sFp << std::endl;
+    vpRotationMatrix sRp({ 0,  0, -1,
+                           0, -1,  0,
+                          -1,  0,  0 });
+    vpForceTwistMatrix sFp(sRp);
+    std::cout << "sFp:\n" << sFp << std::endl;
   }
-#endif
 }
diff --git a/core/sample-vpVelocityTwistMatrix-3.cpp b/core/sample-vpVelocityTwistMatrix-3.cpp
@@ -2,7 +2,6 @@
 
 int main()
 {
-#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
   {
   vpTranslationVector cte(0.1, 0.2, 0.3);
   vpRotationMatrix cRe( {0,  0, -1,
@@ -19,5 +18,4 @@ int main()
   vpVelocityTwistMatrix cVe(cRe);
   std::cout << "cVe:\n" << cVe << std::endl;
   }
-#endif
 }
diff --git a/json/sample-json-vpColVector.cpp b/json/sample-json-vpColVector.cpp
@@ -5,15 +5,8 @@ int main()
 #if defined(VISP_HAVE_NLOHMANN_JSON)
   std::string filename = "col-vector.json";
   {
-#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
     vpColVector v({ 1, 2, 3, 4 });
-#else
-    vpColVector v(4);
-    v[0] = 1;
-    v[1] = 2;
-    v[2] = 3;
-    v[3] = 4;
-#endif
+
     std::ofstream file(filename);
     const nlohmann::json j = v;
     file << j;

diff --git a/json/sample-json-vpHomogeneousMatrix.cpp b/json/sample-json-vpHomogeneousMatrix.cpp
@@ -5,14 +5,8 @@ int main()
 #if defined(VISP_HAVE_NLOHMANN_JSON)
   std::string filename = "homo-mat.json";
   {
-#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
     vpHomogeneousMatrix M(vpTranslationVector(0.1, 0.2, 0.3), vpRotationMatrix({ 0, 0, 1, 0, -1, 0, -1, 0, 0 }));
-#else
-    vpHomogeneousMatrix M;
-    M[0][0] = 0; M[0][1] = 0; M[0][2] = 1; M[0][2] = 0.1;
-    M[1][0] = 0; M[1][1] = -1; M[1][2] = 0; M[1][2] = 0.2;
-    M[2][0] = -1; M[2][1] = 0; M[2][2] = 0; M[2][2] = 0.3;
-#endif
+
     std::ofstream file(filename);
     const nlohmann::json j = M;
     file << j;