Change include of config.h in export macros

RainerKuemmerle · Dec 8, 2024 · 9b3b3e8 · 9b3b3e8
1 parent 4c6c659
commit 9b3b3e8
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 22 deletions.
diff --git a/g2o/core/g2o_core_api.h b/g2o/core/g2o_core_api.h
@@ -10,9 +10,8 @@
 #ifndef G2O_CORE_API_H
 #define G2O_CORE_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
+#include "g2o/config.h"
 // We are using a Microsoft compiler:
 #ifdef G2O_SHARED_LIBS
 #ifdef core_EXPORTS

diff --git a/g2o/stuff/g2o_stuff_api.h b/g2o/stuff/g2o_stuff_api.h
@@ -36,11 +36,10 @@
 #ifndef G2O_STUFF_API_H
 #define G2O_STUFF_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
 // We are using a Microsoft compiler:
 
+#include "g2o/config.h"
 #ifdef G2O_SHARED_LIBS
 #ifdef stuff_EXPORTS
 #define G2O_STUFF_API __declspec(dllexport)

diff --git a/g2o/types/data/g2o_types_data_api.h b/g2o/types/data/g2o_types_data_api.h
@@ -36,10 +36,9 @@
 #ifndef G2O_TYPES_DATA_API_H
 #define G2O_TYPES_DATA_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
 // We are using a Microsoft compiler:
+#include "g2o/config.h"
 #ifdef G2O_SHARED_LIBS
 #ifdef types_data_EXPORTS
 #define G2O_TYPES_DATA_API __declspec(dllexport)

diff --git a/g2o/types/icp/g2o_types_icp_api.h b/g2o/types/icp/g2o_types_icp_api.h
@@ -36,9 +36,8 @@
 #ifndef G2O_TYPES_ICP_API_H
 #define G2O_TYPES_ICP_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
+#include "g2o/config.h"
 // We are using a Microsoft compiler:
 #ifdef G2O_SHARED_LIBS
 #ifdef types_icp_EXPORTS

diff --git a/g2o/types/sba/g2o_types_sba_api.h b/g2o/types/sba/g2o_types_sba_api.h
@@ -36,9 +36,8 @@
 #ifndef G2O_TYPES_SBA_API_H
 #define G2O_TYPES_SBA_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
+#include "g2o/config.h"
 // We are using a Microsoft compiler:
 #ifdef G2O_SHARED_LIBS
 #ifdef types_sba_EXPORTS

diff --git a/g2o/types/sclam2d/g2o_types_sclam2d_api.h b/g2o/types/sclam2d/g2o_types_sclam2d_api.h
@@ -36,9 +36,8 @@
 #ifndef G2O_TYPES_SCLAM2D_API_H
 #define G2O_TYPES_SCLAM2D_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
+#include "g2o/config.h"
 // We are using a Microsoft compiler:
 #ifdef G2O_SHARED_LIBS
 #ifdef types_sclam2d_EXPORTS

diff --git a/g2o/types/sim3/types_seven_dof_expmap_api.h b/g2o/types/sim3/types_seven_dof_expmap_api.h
@@ -1,9 +1,8 @@
 #ifndef G2O_TYPES_SEVEN_DOF_EXPMAP_API_H
 #define G2O_TYPES_SEVEN_DOF_EXPMAP_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
+#include "g2o/config.h"
 // We are using a Microsoft compiler:
 #ifdef G2O_SHARED_LIBS
 #ifdef types_sim3_EXPORTS

diff --git a/g2o/types/slam2d/g2o_types_slam2d_api.h b/g2o/types/slam2d/g2o_types_slam2d_api.h
@@ -36,9 +36,8 @@
 #ifndef G2O_TYPES_SLAM2D_API_H
 #define G2O_TYPES_SLAM2D_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
+#include "g2o/config.h"
 // We are using a Microsoft compiler:
 #ifdef G2O_SHARED_LIBS
 #ifdef types_slam2d_EXPORTS

diff --git a/g2o/types/slam2d_addons/g2o_types_slam2d_addons_api.h b/g2o/types/slam2d_addons/g2o_types_slam2d_addons_api.h
@@ -36,10 +36,9 @@
 #ifndef G2O_TYPES_SLAM2D_ADDONS_API_H
 #define G2O_TYPES_SLAM2D_ADDONS_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
 // We are using a Microsoft compiler:
+#include "g2o/config.h"
 #ifdef G2O_SHARED_LIBS
 #ifdef types_slam2d_addons_EXPORTS
 #define G2O_TYPES_SLAM2D_ADDONS_API __declspec(dllexport)

diff --git a/g2o/types/slam3d/g2o_types_slam3d_api.h b/g2o/types/slam3d/g2o_types_slam3d_api.h
@@ -36,9 +36,8 @@
 #ifndef G2O_TYPES_SLAM3D_API_H
 #define G2O_TYPES_SLAM3D_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
+#include "g2o/config.h"
 // We are using a Microsoft compiler:
 #ifdef G2O_SHARED_LIBS
 #ifdef types_slam3d_EXPORTS

diff --git a/g2o/types/slam3d_addons/g2o_types_slam3d_addons_api.h b/g2o/types/slam3d_addons/g2o_types_slam3d_addons_api.h
@@ -27,10 +27,9 @@
 #ifndef G2O_TYPES_SLAM3D_ADDONS_API_H
 #define G2O_TYPES_SLAM3D_ADDONS_API_H
 
-#include "g2o/config.h"
-
 #ifdef _MSC_VER
 // We are using a Microsoft compiler:
+#include "g2o/config.h"
 #ifdef G2O_SHARED_LIBS
 #ifdef types_slam3d_addons_EXPORTS
 #define G2O_TYPES_SLAM3D_ADDONS_API __declspec(dllexport)