Cleaning up module related macro definitions

Author: hkaiser

cmake/templates/hpx.ixx.in

@@ -20,8 +20,11 @@ module;
 
 export module HPX.Core@cxx_sub_module@;
 
+// Make sure the exported symbols are name-mangled using standard C++ rules.
+// This is necessary as otherwise the symbols exported from the shared libraries
+// will be exported from the module using a differently encoded name.
 extern "C++" {
-    
+
 #if defined(HPX_MSVC)
 // disable warning C5244: '#include <filename>' in the purview of module
 // 'HPX.Core' appears erroneous.  Consider moving that directive before

libs/core/assertion/include/hpx/assertion/api.hpp

@@ -22,6 +22,6 @@ namespace hpx::assertion {
     /// Set the assertion handler to be used within a program. If the handler has been
     /// set already once, the call to this function will be ignored.
     /// \note This function is not thread safe
-    HPX_CORE_MODULE_EXPORT void set_assertion_handler(
+    HPX_CXX_EXPORT HPX_CORE_EXPORT void set_assertion_handler(
         assertion_handler handler);
 }    // namespace hpx::assertion

libs/core/assertion/include/hpx/assertion/evaluate_assert.hpp

@@ -16,7 +16,8 @@
 namespace hpx::assertion::detail {
 
     /// \cond NOINTERNAL
-    HPX_CORE_MODULE_EXPORT void handle_assert(hpx::source_location const& loc,
-        char const* expr, std::string const& msg) noexcept;
+    HPX_CXX_EXPORT HPX_CORE_EXPORT void handle_assert(
+        hpx::source_location const& loc, char const* expr,
+        std::string const& msg) noexcept;
     /// \endcond
 }    // namespace hpx::assertion::detail

libs/core/assertion/include/hpx/assertion/source_location.hpp

@@ -78,6 +78,6 @@ namespace hpx {
     };
 #endif
 
-    HPX_CORE_MODULE_EXPORT std::ostream& operator<<(
+    HPX_CXX_EXPORT HPX_CORE_EXPORT std::ostream& operator<<(
         std::ostream& os, source_location const& loc);
 }    // namespace hpx

libs/core/config/include/hpx/config/export_definitions.hpp

@@ -28,7 +28,7 @@
 # define HPX_SYMBOL_INTERNAL    /* empty */
 #elif defined(HPX_HAVE_ELF_HIDDEN_VISIBILITY)
 # define HPX_SYMBOL_EXPORT      __attribute__((visibility("default")))
-# define HPX_SYMBOL_IMPORT      /* empty */
+# define HPX_SYMBOL_IMPORT      __attribute__((visibility("default")))
 # define HPX_SYMBOL_INTERNAL    __attribute__((visibility("hidden")))
 #endif
 
@@ -58,10 +58,6 @@
 # define HPX_CXX_EXPORT                  /* empty */
 #endif
 
-#define HPX_CORE_MODULE_EXPORT           HPX_CXX_EXPORT HPX_CORE_EXPORT
-#define HPX_CORE_MODULE_EXPORT_NODISCARD                                       \
-    HPX_CXX_EXPORT [[nodiscard]] HPX_CORE_EXPORT
-
 ///////////////////////////////////////////////////////////////////////////////
 #if defined(HPX_EXPORTS) || defined(HPX_FULL_EXPORTS)
 # define  HPX_EXPORT             HPX_SYMBOL_EXPORT

libs/core/debugging/include/hpx/debugging/attach_debugger.hpp

@@ -13,5 +13,5 @@ namespace hpx::util {
 
     /// Tries to break an attached debugger, if not supported a loop is
     /// invoked which gives enough time to attach a debugger manually.
-    HPX_CORE_MODULE_EXPORT void attach_debugger();
+    HPX_CXX_EXPORT HPX_CORE_EXPORT void attach_debugger();
 }    // namespace hpx::util

libs/core/debugging/include/hpx/debugging/backtrace/backtrace.hpp

@@ -73,7 +73,7 @@ namespace hpx::util {
             backtrace const* tr_;
         };
 
-        HPX_CORE_MODULE_EXPORT std::ostream& operator<<(
+        HPX_CXX_EXPORT HPX_CORE_EXPORT std::ostream& operator<<(
             std::ostream& out, trace_manip const& t);
     }    // namespace detail
 
@@ -84,6 +84,6 @@ namespace hpx::util {
         return detail::trace_manip(tr);
     }
 
-    HPX_CORE_MODULE_EXPORT_NODISCARD std::string trace(
+    HPX_CXX_EXPORT [[nodiscard]] HPX_CORE_EXPORT std::string trace(
         std::size_t frames_no = HPX_HAVE_THREAD_BACKTRACE_DEPTH);
 }    // namespace hpx::util

libs/core/debugging/include/hpx/debugging/environ.hpp

@@ -25,7 +25,7 @@
 // On FreeBSD the environment is available for executables only, so needs to be
 // handled explicitly (e.g. see hpx_init_impl.hpp)
 // The variable is defined in debugging/src/print.cpp
-HPX_CORE_MODULE_EXPORT char** freebsd_environ;
+HPX_CXX_EXPORT HPX_CORE_EXPORT char** freebsd_environ;
 #else
 // this case is handled in debugging/macros.hpp
 extern char** environ;

libs/core/debugging/include/hpx/debugging/print.hpp

@@ -153,7 +153,7 @@ namespace hpx::debug {
             }
         };
 
-        HPX_CORE_MODULE_EXPORT void print_ptr(
+        HPX_CXX_EXPORT HPX_CORE_EXPORT void print_ptr(
             std::ostream& os, void const* v, int n);
 
         HPX_CXX_EXPORT template <int N, typename T>
@@ -219,7 +219,7 @@ namespace hpx::debug {
     // ------------------------------------------------------------------
     namespace detail {
 
-        HPX_CORE_MODULE_EXPORT void print_str(
+        HPX_CXX_EXPORT HPX_CORE_EXPORT void print_str(
             std::ostream& os, char const* v, int n);
     }
 
@@ -325,12 +325,13 @@ namespace hpx::debug {
         };
 
         ///////////////////////////////////////////////////////////////////////
-        HPX_CORE_MODULE_EXPORT void register_print_info(
+        HPX_CXX_EXPORT HPX_CORE_EXPORT void register_print_info(
             void (*)(std::ostream&));
-        HPX_CORE_MODULE_EXPORT void generate_prefix(std::ostream& os);
+        HPX_CXX_EXPORT HPX_CORE_EXPORT void generate_prefix(std::ostream& os);
 
         ///////////////////////////////////////////////////////////////////////
-        HPX_CORE_MODULE_EXPORT void display_to_cout(std::string const& str);
+        HPX_CXX_EXPORT HPX_CORE_EXPORT void display_to_cout(
+            std::string const& str);
 
         HPX_CXX_EXPORT template <typename... Args>
         void display(char const* prefix, Args const&... args)

libs/core/errors/include/hpx/errors/error.hpp

@@ -328,7 +328,7 @@ namespace hpx {
 #undef HPX_ERROR_UNSCOPED_ENUM_DEPRECATION_MSG
 
     // Return a textual representation of a given error code
-    HPX_CORE_MODULE_EXPORT char const* get_error_name(error e) noexcept;
+    HPX_CXX_EXPORT HPX_CORE_EXPORT char const* get_error_name(error e) noexcept;
 
 }    // namespace hpx