Versioned inline namespaces throughout

traversaro · Aug 17, 2017 · f002680 · f002680
1 parent ea83d11
commit f002680
Show file tree

Hide file tree

Showing 40 changed files with 155 additions and 2 deletions.
diff --git a/include/ignition/math/Angle.hh b/include/ignition/math/Angle.hh
@@ -18,8 +18,8 @@
 #define IGNITION_MATH_ANGLE_HH_
 
 #include <iostream>
-#include <ignition/math/config.hh>
 #include <ignition/math/Helpers.hh>
+#include <ignition/math/config.hh>
 
 /// \brief Macro that converts radians to degrees
 /// \param[in] radians

diff --git a/include/ignition/math/Box.hh b/include/ignition/math/Box.hh
@@ -22,11 +22,14 @@
 #include <ignition/math/Helpers.hh>
 #include <ignition/math/Vector3.hh>
 #include <ignition/math/Line3.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     // Forward declaration of private data
     class BoxPrivate;
 
@@ -231,6 +234,7 @@ namespace ignition
       /// \brief Private data pointer
       private: BoxPrivate *dataPtr;
     };
+    }
   }
 }
 #endif
diff --git a/include/ignition/math/BoxPrivate.hh b/include/ignition/math/BoxPrivate.hh
@@ -18,11 +18,14 @@
 #define IGNITION_MATH_BOXPRIVATE_HH_
 
 #include <ignition/math/Vector3.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \internal
     /// \brief Private data for Box class
     class BoxPrivate
@@ -33,6 +36,7 @@ namespace ignition
       /// \brief Maximum corner of the box
       public: Vector3d max = Vector3d(LOW_D, LOW_D, LOW_D);
     };
+    }
   }
 }
 #endif
diff --git a/include/ignition/math/Color.hh b/include/ignition/math/Color.hh
@@ -21,11 +21,14 @@
 
 #include <ignition/math/Helpers.hh>
 #include <ignition/math/Vector3.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \class Color Color.hh ignition/math/Color.hh
     /// \brief Defines a color using a red (R), green (G), blue (B), and alpha
     /// (A) component. Each color component is in the range [0..1].
@@ -313,6 +316,7 @@ namespace ignition
       /// \brief Alpha value
       private: float a = 1;
     };
+    }
   }
 }
 #endif
diff --git a/include/ignition/math/Filter.hh b/include/ignition/math/Filter.hh
@@ -20,11 +20,14 @@
 #include <ignition/math/Helpers.hh>
 #include <ignition/math/Vector3.hh>
 #include <ignition/math/Quaternion.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \class Filter Filter.hh ignition/math/Filter.hh
     /// \brief Filter base class
     template <class T>
@@ -241,6 +244,7 @@ namespace ignition
         this->Set(math::Vector3d(0, 0, 0));
       }
     };
+    }
   }
 }
 

diff --git a/include/ignition/math/Frustum.hh b/include/ignition/math/Frustum.hh
@@ -20,11 +20,14 @@
 #include <ignition/math/Plane.hh>
 #include <ignition/math/Angle.hh>
 #include <ignition/math/Pose3.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     // Forward declaration of private data
     class FrustumPrivate;
 
@@ -176,6 +179,7 @@ namespace ignition
       /// \brief Private data pointer
       private: FrustumPrivate *dataPtr;
     };
+    }
   }
 }
 #endif
diff --git a/include/ignition/math/FrustumPrivate.hh b/include/ignition/math/FrustumPrivate.hh
@@ -22,11 +22,14 @@
 #include <ignition/math/Pose3.hh>
 #include <ignition/math/Angle.hh>
 #include <ignition/math/Plane.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \internal
     /// \brief Private data for the Frustum class
     class FrustumPrivate
@@ -73,6 +76,7 @@ namespace ignition
       /// \sa Frustum::FrustumPlane
       public: std::array<Planed, 6> planes;
     };
+    }
   }
 }
 #endif
diff --git a/include/ignition/math/Helpers.hh b/include/ignition/math/Helpers.hh
@@ -27,6 +27,7 @@
 #include <cstdint>
 
 #include <ignition/math/System.hh>
+#include <ignition/math/config.hh>
 
 /// \brief Double maximum value. This value will be similar to 1.79769e+308
 /// \deprecated Use static const value instead.
@@ -209,6 +210,8 @@ namespace ignition
   /// \brief Math classes and function useful in robot applications.
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \brief size_t type with a value of 0
     static const size_t IGN_ZERO_SIZE_T  = 0u;
 
@@ -763,6 +766,7 @@ namespace ignition
     /// \sa Pair
     std::tuple<PairInput, PairInput> IGNITION_VISIBLE Unpair(
         const PairOutput _key);
+    }
   }
 }
 

diff --git a/include/ignition/math/Inertial.hh b/include/ignition/math/Inertial.hh
@@ -19,11 +19,14 @@
 
 #include "ignition/math/MassMatrix3.hh"
 #include "ignition/math/Pose3.hh"
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \class Inertial Inertial.hh ignition/math/Inertial.hh
     /// \brief A class for inertial information about a rigid body
     /// consisting of the scalar mass, a 3x3 symmetric moment
@@ -239,6 +242,7 @@ namespace ignition
 
     typedef Inertial<double> Inertiald;
     typedef Inertial<float> Inertialf;
+    }
   }
 }
 #endif
diff --git a/include/ignition/math/Kmeans.hh b/include/ignition/math/Kmeans.hh
@@ -20,11 +20,14 @@
 #include <vector>
 #include <ignition/math/Vector3.hh>
 #include <ignition/math/Helpers.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     // Forward declare private data
     class KmeansPrivate;
 
@@ -79,6 +82,7 @@ namespace ignition
       /// \brief Private data pointer
       private: KmeansPrivate *dataPtr;
     };
+    }
   }
 }
 

diff --git a/include/ignition/math/KmeansPrivate.hh b/include/ignition/math/KmeansPrivate.hh
@@ -20,11 +20,14 @@
 #include <vector>
 #include <ignition/math/Vector3.hh>
 #include <ignition/math/Helpers.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \internal
     /// \brief Private data for Kmeans class
     class KmeansPrivate
@@ -44,6 +47,7 @@ namespace ignition
       /// \brief Counts the number of observations contained in each partition.
       public: std::vector<unsigned int> counters;
     };
+    }
   }
 }
 #endif

diff --git a/include/ignition/math/Line2.hh b/include/ignition/math/Line2.hh
@@ -19,11 +19,14 @@
 
 #include <algorithm>
 #include <ignition/math/Vector2.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \class Line2 Line2.hh ignition/math/Line2.hh
     /// \brief A two dimensional line segment. The line is defined by a
     /// start and end point.
@@ -310,6 +313,7 @@ namespace ignition
     typedef Line2<int> Line2i;
     typedef Line2<double> Line2d;
     typedef Line2<float> Line2f;
+    }
   }
 }
 #endif
diff --git a/include/ignition/math/Line3.hh b/include/ignition/math/Line3.hh
@@ -19,11 +19,14 @@
 
 #include <algorithm>
 #include <ignition/math/Vector3.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \class Line3 Line3.hh ignition/math/Line3.hh
     /// \brief A three dimensional line segment. The line is defined by a
     /// start and end point.
@@ -383,6 +386,7 @@ namespace ignition
     typedef Line3<int> Line3i;
     typedef Line3<double> Line3d;
     typedef Line3<float> Line3f;
+    }
   }
 }
 #endif
diff --git a/include/ignition/math/MassMatrix3.hh b/include/ignition/math/MassMatrix3.hh
@@ -26,11 +26,14 @@
 #include "ignition/math/Vector2.hh"
 #include "ignition/math/Vector3.hh"
 #include "ignition/math/Matrix3.hh"
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \class MassMatrix3 MassMatrix3.hh ignition/math/MassMatrix3.hh
     /// \brief A class for inertial information about a rigid body
     /// consisting of the scalar mass and a 3x3 symmetric moment
@@ -899,6 +902,7 @@ namespace ignition
 
     typedef MassMatrix3<double> MassMatrix3d;
     typedef MassMatrix3<float> MassMatrix3f;
+    }
   }
 }
 #endif
diff --git a/include/ignition/math/Matrix3.hh b/include/ignition/math/Matrix3.hh
@@ -22,11 +22,14 @@
 #include <ignition/math/Helpers.hh>
 #include <ignition/math/Vector3.hh>
 #include <ignition/math/Quaternion.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     template <typename T> class Quaternion;
 
     /// \class Matrix3 Matrix3.hh ignition/math/Matrix3.hh
@@ -538,6 +541,7 @@ namespace ignition
     typedef Matrix3<int> Matrix3i;
     typedef Matrix3<double> Matrix3d;
     typedef Matrix3<float> Matrix3f;
+    }
   }
 }
 

diff --git a/include/ignition/math/Matrix4.hh b/include/ignition/math/Matrix4.hh
@@ -22,11 +22,14 @@
 #include <ignition/math/Matrix3.hh>
 #include <ignition/math/Vector3.hh>
 #include <ignition/math/Pose3.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \class Matrix4 Matrix4.hh ignition/math/Matrix4.hh
     /// \brief A 4x4 matrix class
     template<typename T>
@@ -885,6 +888,7 @@ namespace ignition
     typedef Matrix4<int> Matrix4i;
     typedef Matrix4<double> Matrix4d;
     typedef Matrix4<float> Matrix4f;
+    }
   }
 }
 #endif
diff --git a/include/ignition/math/OrientedBox.hh b/include/ignition/math/OrientedBox.hh
@@ -22,11 +22,14 @@
 #include <ignition/math/Matrix4.hh>
 #include <ignition/math/Pose3.hh>
 #include <ignition/math/Vector3.hh>
+#include <ignition/math/config.hh>
 
 namespace ignition
 {
   namespace math
   {
+    inline namespace IGNITION_MATH_VERSION_NAMESPACE
+    {
     /// \brief Mathematical representation of a box which can be arbitrarily
     /// positioned and rotated.
     template<typename T>
@@ -182,6 +185,7 @@ namespace ignition
     typedef OrientedBox<int> OrientedBoxi;
     typedef OrientedBox<double> OrientedBoxd;
     typedef OrientedBox<float> OrientedBoxf;
+    }
   }
 }
 #endif