From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Tue, 13 Mar 2018 15:56:46 +0000 (+0100)
Subject: Remove parameter from XBT_EXPORT_NO_IMPORT/XBT_IMPORT_NO_EXPORT.
X-Git-Tag: v3.19~63
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/eaaf15df4b2bd557800632665a9dee66378c192a

Remove parameter from XBT_EXPORT_NO_IMPORT/XBT_IMPORT_NO_EXPORT.
---

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 7663714f92..9a93fc7dcd 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1454,8 +1454,8 @@ INCLUDE_FILE_PATTERNS  =
 # instead of the = operator.
 
 PREDEFINED             = XBT_PUBLIC= \
-                         XBT_EXPORT_NO_IMPORT(type)=type \
-                         XBT_IMPORT_NO_EXPORT(type)=type \
+                         XBT_EXPORT_NO_IMPORT= \
+                         XBT_IMPORT_NO_EXPORT= \
                          XBT_PUBLIC_DATA=extern \
                          XBT_INLINE= \
 			 XBT_PRIVATE=
diff --git a/include/xbt/base.h b/include/xbt/base.h
index 3129f5db17..24f28c2f94 100644
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -156,33 +156,33 @@
 
 /* Build the DLL */
 #if defined(DLL_EXPORT)
-#  define XBT_PUBLIC                  __declspec(dllexport)
-#  define XBT_EXPORT_NO_IMPORT(type)  __declspec(dllexport) type
-#  define XBT_IMPORT_NO_EXPORT(type)  type
-#  define XBT_PUBLIC_DATA             extern __declspec(dllexport)
+#  define XBT_PUBLIC            __declspec(dllexport)
+#  define XBT_EXPORT_NO_IMPORT  __declspec(dllexport)
+#  define XBT_IMPORT_NO_EXPORT
+#  define XBT_PUBLIC_DATA       extern __declspec(dllexport)
 #  define XBT_PRIVATE
 
 /* Link against the DLL */
 #elif (defined(_WIN32) && !defined(DLL_EXPORT))
-#  define XBT_PUBLIC                  __declspec(dllimport)
-#  define XBT_EXPORT_NO_IMPORT(type)  type
-#  define XBT_IMPORT_NO_EXPORT(type)  __declspec(dllimport) type
-#  define XBT_PUBLIC_DATA             extern __declspec(dllimport)
+#  define XBT_PUBLIC            __declspec(dllimport)
+#  define XBT_EXPORT_NO_IMPORT
+#  define XBT_IMPORT_NO_EXPORT  __declspec(dllimport)
+#  define XBT_PUBLIC_DATA       extern __declspec(dllimport)
 #  define XBT_PRIVATE
 
 #elif defined(__ELF__)
-#  define XBT_PUBLIC                  __attribute__((visibility("default")))
-#  define XBT_EXPORT_NO_IMPORT(type)  __attribute__((visibility("default"))) type
-#  define XBT_IMPORT_NO_EXPORT(type)  __attribute__((visibility("default"))) type
-#  define XBT_PUBLIC_DATA             extern __attribute__((visibility("default")))
-#  define XBT_PRIVATE                 __attribute__((visibility("hidden")))
+#  define XBT_PUBLIC            __attribute__((visibility("default")))
+#  define XBT_EXPORT_NO_IMPORT  __attribute__((visibility("default")))
+#  define XBT_IMPORT_NO_EXPORT  __attribute__((visibility("default")))
+#  define XBT_PUBLIC_DATA       extern __attribute__((visibility("default")))
+#  define XBT_PRIVATE           __attribute__((visibility("hidden")))
 
 #else
-#  define XBT_PUBLIC                  /* public */
-#  define XBT_EXPORT_NO_IMPORT(type)  type
-#  define XBT_IMPORT_NO_EXPORT(type)  type
-#  define XBT_PUBLIC_DATA             extern
-#  define XBT_PRIVATE                 /** @private */
+#  define XBT_PUBLIC            /* public */
+#  define XBT_EXPORT_NO_IMPORT
+#  define XBT_IMPORT_NO_EXPORT
+#  define XBT_PUBLIC_DATA       extern
+#  define XBT_PRIVATE           /** @private */
 
 #endif
 
diff --git a/include/xbt/log.h b/include/xbt/log.h
index 0182bd538a..ebaa88f44c 100644
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -112,8 +112,7 @@ typedef enum {
     }                                                                                                                  \
   }                                                                                                                    \
   SG_END_DECL()                                                                                                        \
-  XBT_EXPORT_NO_IMPORT(s_xbt_log_category_t)                                                                           \
-  _XBT_LOGV(catName) = {                                                                                               \
+  XBT_EXPORT_NO_IMPORT s_xbt_log_category_t _XBT_LOGV(catName) = {                                                     \
       &_XBT_LOGV(parent),                                                                                              \
       NULL /* firstChild */,                                                                                           \
       NULL /* nextSibling */,                                                                                          \
diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp
index 1e6a84b675..5ca3c34908 100644
--- a/src/xbt/config.cpp
+++ b/src/xbt/config.cpp
@@ -29,7 +29,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
 
-XBT_EXPORT_NO_IMPORT(xbt_cfg_t) simgrid_config = nullptr;
+XBT_EXPORT_NO_IMPORT xbt_cfg_t simgrid_config = nullptr;
 extern "C" XBT_PUBLIC void sg_config_finalize();
 
 namespace simgrid {