[CLEAN] Claened some files: reordered include, removed useless VISP_N…

…AMESPACE_ADDRESSING, ...
lagadic · Jun 4, 2024 · 30eefc9 · 30eefc9
1 parent 264f9f8
commit 30eefc9
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 12 deletions.
diff --git a/modules/core/include/visp3/core/vpArray2D.h b/modules/core/include/visp3/core/vpArray2D.h
@@ -1328,11 +1328,8 @@ template <class Type> bool vpArray2D<Type>::operator!=(const vpArray2D<Type> &A)
 
 #ifdef VISP_HAVE_NLOHMANN_JSON
 template <class Type>
-inline void from_json(const nlohmann::json &j, VISP_NAMESPACE_ADDRESSING vpArray2D<Type> &array)
+inline void from_json(const nlohmann::json &j, vpArray2D<Type> &array)
 {
-#ifdef ENABLE_VISP_NAMESPACE
-  using namespace VISP_NAMESPACE_NAME;
-#endif
   if (j.is_array()) {
     const unsigned int nrows = static_cast<unsigned int>(j.size());
     if (nrows == 0) { // Initialize an empty array, Finished
@@ -1384,7 +1381,7 @@ inline void from_json(const nlohmann::json &j, VISP_NAMESPACE_ADDRESSING vpArray
 
 
 template <class Type>
-inline void to_json(nlohmann::json &j, const VISP_NAMESPACE_ADDRESSING vpArray2D<Type> &array)
+inline void to_json(nlohmann::json &j, const vpArray2D<Type> &array)
 {
   j = {
     {"cols", array.colNum},

diff --git a/modules/core/include/visp3/core/vpHomogeneousMatrix.h b/modules/core/include/visp3/core/vpHomogeneousMatrix.h
@@ -57,7 +57,6 @@ class vpPoint;
 
 END_VISP_NAMESPACE
 
-#include <visp3/core/vpConfig.h>
 #include <visp3/core/vpArray2D.h>
 #include <visp3/core/vpRotationMatrix.h>
 #include <visp3/core/vpThetaUVector.h>

diff --git a/modules/core/include/visp3/core/vpPoint.h b/modules/core/include/visp3/core/vpPoint.h
@@ -39,6 +39,7 @@
 #ifndef _vpPoint_H_
 #define _vpPoint_H_
 
+#include <visp3/core/vpConfig.h>
 #include <visp3/core/vpColor.h>
 #include <visp3/core/vpForwardProjection.h>
 #include <visp3/core/vpMatrix.h>

diff --git a/modules/core/include/visp3/core/vpPoseVector.h b/modules/core/include/visp3/core/vpPoseVector.h
@@ -55,9 +55,7 @@ class vpHomogeneousMatrix;
 class vpTranslationVector;
 class vpThetaUVector;
 class vpRowVector;
-END_VISP_NAMESPACE
 
-BEGIN_VISP_NAMESPACE
 /*!
   \class vpPoseVector
 

diff --git a/modules/core/include/visp3/core/vpRobust.h b/modules/core/include/visp3/core/vpRobust.h
@@ -38,8 +38,8 @@
 #ifndef vpRobust_h
 #define vpRobust_h
 
-#include <visp3/core/vpColVector.h>
 #include <visp3/core/vpConfig.h>
+#include <visp3/core/vpColVector.h>
 #include <visp3/core/vpMath.h>
 
 BEGIN_VISP_NAMESPACE

diff --git a/modules/core/include/visp3/core/vpRotationVector.h b/modules/core/include/visp3/core/vpRotationVector.h
@@ -44,8 +44,8 @@
 #include <math.h>
 #include <stdio.h>
 
-#include <visp3/core/vpArray2D.h>
 #include <visp3/core/vpConfig.h>
+#include <visp3/core/vpArray2D.h>
 
 BEGIN_VISP_NAMESPACE
 

diff --git a/modules/core/include/visp3/core/vpRowVector.h b/modules/core/include/visp3/core/vpRowVector.h
@@ -337,7 +337,7 @@ class VISP_EXPORT vpRowVector : public vpArray2D<double>
 #endif
 };
 
-VISP_EXPORT VISP_NAMESPACE_ADDRESSING vpRowVector operator*(const double &x, const VISP_NAMESPACE_ADDRESSING vpRowVector &v);
+VISP_EXPORT vpRowVector operator*(const double &x, const vpRowVector &v);
 
 END_VISP_NAMESPACE
 #endif
diff --git a/modules/tracker/mbt/include/visp3/mbt/vpMbTracker.h b/modules/tracker/mbt/include/visp3/mbt/vpMbTracker.h
@@ -49,9 +49,9 @@
 #include <string>
 #include <vector>
 
+#include <visp3/core/vpConfig.h>
 #include <visp3/core/vpCameraParameters.h>
 #include <visp3/core/vpColVector.h>
-#include <visp3/core/vpConfig.h>
 #include <visp3/core/vpHomogeneousMatrix.h>
 #include <visp3/core/vpImage.h>
 #include <visp3/core/vpImagePoint.h>