Reverting visibility_control changes

Signed-off-by: CursedRock17 <[email protected]> Visibility Controls utils.hpp Signed-off-by: Lucas Wendland <[email protected]> Visibility Controls convert.hpp Signed-off-by: Lucas Wendland <[email protected]> Visibility Controls Quaternion.hpp Signed-off-by: Lucas Wendland <[email protected]> Visibility Controls Vector3.hpp Signed-off-by: Lucas Wendland <[email protected]> Visibility Controls QuadWord.hpp Signed-off-by: Lucas Wendland <[email protected]> Visibility Controls Transform.hpp Signed-off-by: Lucas Wendland <[email protected]> Visibility Controls exceptions.hpp Signed-off-by: Lucas Wendland <[email protected]> Visibility Controls time_cache.hpp Signed-off-by: Lucas Wendland <[email protected]> Visibility Controls transform_storage.hpp Signed-off-by: Lucas Wendland <[email protected]> Update time.hpp Signed-off-by: Lucas Wendland <[email protected]> Update buffer_core.hpp Signed-off-by: Lucas Wendland <[email protected]> Update buffer_core_interface.hpp Signed-off-by: Lucas Wendland <[email protected]>
ros2 · Nov 6, 2024 · f390cce · f390cce
1 parent 3a21ba2
commit f390cce
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 77 deletions.
diff --git a/tf2/include/tf2/LinearMath/QuadWord.hpp b/tf2/include/tf2/LinearMath/QuadWord.hpp
@@ -18,7 +18,7 @@ subject to the following restrictions:
 
 #include "Scalar.hpp"
 #include "MinMax.hpp"
-#include "tf2/visibility_control.hpp"
+#include "tf2/visibility_control.h"
 
 
 #if defined (__CELLOS_LV2) && defined (__SPU__)

diff --git a/tf2/include/tf2/LinearMath/Quaternion.hpp b/tf2/include/tf2/LinearMath/Quaternion.hpp
@@ -20,7 +20,7 @@ subject to the following restrictions:
 
 #include "Vector3.hpp"
 #include "QuadWord.hpp"
-#include "tf2/visibility_control.hpp"
+#include "tf2/visibility_control.h"
 
 namespace tf2
 {

diff --git a/tf2/include/tf2/LinearMath/Transform.hpp b/tf2/include/tf2/LinearMath/Transform.hpp
@@ -19,7 +19,7 @@ subject to the following restrictions:
 
 
 #include "Matrix3x3.hpp"
-#include "tf2/visibility_control.hpp"
+#include "tf2/visibility_control.h"
 
 
 namespace tf2

diff --git a/tf2/include/tf2/LinearMath/Vector3.hpp b/tf2/include/tf2/LinearMath/Vector3.hpp
@@ -20,7 +20,7 @@ subject to the following restrictions:
 
 #include "Scalar.hpp"
 #include "MinMax.hpp"
-#include "tf2/visibility_control.hpp"
+#include "tf2/visibility_control.h"
 
 namespace tf2
 {

diff --git a/tf2/include/tf2/buffer_core.hpp b/tf2/include/tf2/buffer_core.hpp
@@ -51,7 +51,7 @@
 #include "tf2/buffer_core_interface.hpp"
 #include "tf2/exceptions.hpp"
 #include "tf2/transform_storage.hpp"
-#include "tf2/visibility_control.hpp"
+#include "tf2/visibility_control.h"
 
 namespace tf2
 {

diff --git a/tf2/include/tf2/buffer_core_interface.hpp b/tf2/include/tf2/buffer_core_interface.hpp
@@ -34,7 +34,7 @@
 #include "geometry_msgs/msg/transform_stamped.hpp"
 
 #include "tf2/time.hpp"
-#include "tf2/visibility_control.hpp"
+#include "tf2/visibility_control.h"
 
 namespace tf2
 {

diff --git a/tf2/include/tf2/convert.hpp b/tf2/include/tf2/convert.hpp
@@ -40,7 +40,7 @@
 #include "tf2/exceptions.hpp"
 #include "tf2/impl/convert.hpp"
 #include "tf2/transform_datatypes.hpp"
-#include "tf2/visibility_control.hpp"
+#include "tf2/visibility_control.h"
 
 namespace tf2
 {

diff --git a/tf2/include/tf2/exceptions.hpp b/tf2/include/tf2/exceptions.hpp
@@ -35,7 +35,7 @@
 #include <cstdint>
 #include <string>
 
-#include "tf2/visibility_control.hpp"
+#include "tf2/visibility_control.h"
 
 namespace tf2
 {

diff --git a/tf2/include/tf2/time.hpp b/tf2/include/tf2/time.hpp
@@ -33,7 +33,7 @@
 #include <cmath>
 #include <string>
 
-#include "tf2/visibility_control.hpp"
+#include "tf2/visibility_control.h"
 
 namespace tf2
 {

diff --git a/tf2/include/tf2/time_cache.hpp b/tf2/include/tf2/time_cache.hpp
@@ -30,14 +30,15 @@
 #ifndef TF2__TIME_CACHE_HPP_
 #define TF2__TIME_CACHE_HPP_
 
+#include "tf2/visibility_control.h"
+
 #include <chrono>
 #include <memory>
 #include <list>
 #include <sstream>
 #include <string>
 #include <utility>
 
-#include "tf2/visibility_control.hpp"
 #include "tf2/transform_storage.hpp"
 #include "tf2/exceptions.hpp"
 

diff --git a/tf2/include/tf2/transform_storage.hpp b/tf2/include/tf2/transform_storage.hpp
@@ -30,10 +30,11 @@
 #ifndef TF2__TRANSFORM_STORAGE_HPP_
 #define TF2__TRANSFORM_STORAGE_HPP_
 
+#include "tf2/visibility_control.h"
+
 #include "tf2/LinearMath/Vector3.hpp"
 #include "tf2/LinearMath/Quaternion.hpp"
 #include "tf2/time.hpp"
-#include "tf2/visibility_control.hpp"
 
 namespace tf2
 {

diff --git a/tf2/include/tf2/utils.hpp b/tf2/include/tf2/utils.hpp
@@ -18,7 +18,7 @@
 #include <tf2/LinearMath/Transform.hpp>
 #include <tf2/LinearMath/Quaternion.hpp>
 #include <tf2/impl/utils.hpp>
-#include <tf2/visibility_control.hpp>
+#include <tf2/visibility_control.h>
 
 namespace tf2
 {

diff --git a/tf2/include/tf2/visibility_control.h b/tf2/include/tf2/visibility_control.h
@@ -29,8 +29,35 @@
 #ifndef TF2__VISIBILITY_CONTROL_H_
 #define TF2__VISIBILITY_CONTROL_H_
 
-#warning This header is obsolete, please include tf2/visibility_control.hpp instead
+// This logic was borrowed (then namespaced) from the examples on the gcc wiki:
+//     https://gcc.gnu.org/wiki/Visibility
 
-#include <tf2/visibility_control.hpp>
+#if defined _WIN32 || defined __CYGWIN__
+  #ifdef __GNUC__
+    #define TF2_EXPORT __attribute__ ((dllexport))
+    #define TF2_IMPORT __attribute__ ((dllimport))
+  #else
+    #define TF2_EXPORT __declspec(dllexport)
+    #define TF2_IMPORT __declspec(dllimport)
+  #endif
+  #ifdef TF2_BUILDING_DLL
+    #define TF2_PUBLIC TF2_EXPORT
+  #else
+    #define TF2_PUBLIC TF2_IMPORT
+  #endif
+  #define TF2_PUBLIC_TYPE TF2_PUBLIC
+  #define TF2_LOCAL
+#else
+  #define TF2_EXPORT __attribute__ ((visibility("default")))
+  #define TF2_IMPORT
+  #if __GNUC__ >= 4
+    #define TF2_PUBLIC __attribute__ ((visibility("default")))
+    #define TF2_LOCAL  __attribute__ ((visibility("hidden")))
+  #else
+    #define TF2_PUBLIC
+    #define TF2_LOCAL
+  #endif
+  #define TF2_PUBLIC_TYPE
+#endif
 
 #endif  // TF2__VISIBILITY_CONTROL_H_
diff --git a/tf2/include/tf2/visibility_control.hpp b/tf2/include/tf2/visibility_control.hpp