Fixes for msvc and updating test cases

jeremy-rifkin · Dec 5, 2023 · 2b201ce · 2b201ce
1 parent 674567e
commit 2b201ce
Show file tree

Hide file tree

Showing 10 changed files with 1,041 additions and 1,194 deletions.
diff --git a/include/assert/assert.hpp b/include/assert/assert.hpp
@@ -94,6 +94,14 @@
  #define LIBASSERT_GCC_ISNT_STUPID 1
 #endif
 
+#if LIBASSERT_IS_MSVC
+ #pragma warning(push)
+ // warning C4251: using non-dll-exported type in dll-exported type, firing on std::vector<frame_ptr> and others for some
+ // reason
+ // 4275 is the same thing but for base classes
+ #pragma warning(disable: 4251; disable: 4275)
+#endif
+
 namespace libassert {
     enum class assert_type {
         debug_assertion,
@@ -112,7 +120,7 @@ namespace libassert {
 #ifndef LIBASSERT_FAIL
  LIBASSERT_EXPORT
 #endif
-void LIBASSERT_FAIL(libassert::assert_type type, const libassert::assertion_printer& printer);
+LIBASSERT_EXPORT void LIBASSERT_FAIL(libassert::assert_type type, const libassert::assertion_printer& printer);
 
 // always_false is just convenient to use here
 #define LIBASSERT_PHONY_USE(E) ((void)libassert::detail::always_false<decltype(E)>)
@@ -183,7 +191,7 @@ namespace libassert::detail {
         opaque_trace& operator=(opaque_trace&&) = delete;
     };
 
-    opaque_trace get_stacktrace_opaque();
+    LIBASSERT_EXPORT opaque_trace get_stacktrace_opaque();
 
     /*
      * metaprogramming utilities
@@ -1137,6 +1145,10 @@ namespace libassert::detail {
     }
 }
 
+#if LIBASSERT_IS_MSVC
+ #pragma warning(pop)
+#endif
+
 inline void ERROR_ASSERTION_FAILURE_IN_CONSTEXPR_CONTEXT() {
     // This non-constexpr method is called from an assertion in a constexpr context if a failure occurs. It is
     // intentionally a no-op.
@@ -1302,10 +1314,11 @@ inline void ERROR_ASSERTION_FAILURE_IN_CONSTEXPR_CONTEXT() {
 // lambdas but that's potentially very expensive compile-time wise. Need to investigate further.
 // Note: libassert::detail::expression_decomposer(libassert::detail::expression_decomposer{} << expr) done for ternary
 #if LIBASSERT_IS_MSVC
- #define LIBASSERT_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{libassert_msvc_pfunc}
+ #define LIBASSERT_INVOKE_VAL_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{libassert_msvc_pfunc}
 #else
- #define LIBASSERT_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{LIBASSERT_PFUNC}
+ #define LIBASSERT_INVOKE_VAL_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{LIBASSERT_PFUNC}
 #endif
+#define LIBASSERT_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{LIBASSERT_PFUNC}
 #if LIBASSERT_IS_CLANG // -Wall in clang
  #define LIBASSERT_IGNORE_UNUSED_VALUE _Pragma("GCC diagnostic ignored \"-Wunused-value\"")
 #else
@@ -1384,11 +1397,11 @@ inline void ERROR_ASSERTION_FAILURE_IN_CONSTEXPR_CONTEXT() {
               LIBASSERT_STATIC_DATA(name, libassert::assert_type::type, #expr, __VA_ARGS__) \
               if constexpr(sizeof libassert_decomposer > 32) { \
                 process_assert_fail(libassert_decomposer, libassert_params \
-                                           LIBASSERT_VA_ARGS(__VA_ARGS__) LIBASSERT_PRETTY_FUNCTION_ARG); \
+                                           LIBASSERT_VA_ARGS(__VA_ARGS__) LIBASSERT_INVOKE_VAL_PRETTY_FUNCTION_ARG); \
               } else { \
                 /* std::move it to assert_fail_m, will be moved back to r */ \
                 auto libassert_r = process_assert_fail_m(std::move(libassert_decomposer), libassert_params \
-                                           LIBASSERT_VA_ARGS(__VA_ARGS__) LIBASSERT_PRETTY_FUNCTION_ARG); \
+                                           LIBASSERT_VA_ARGS(__VA_ARGS__) LIBASSERT_INVOKE_VAL_PRETTY_FUNCTION_ARG); \
                 /* can't move-assign back to decomposer if it holds reference members */ \
                 LIBASSERT_DESTROY_DECOMPOSER; \
                 new (&libassert_decomposer) libassert::detail::expression_decomposer(std::move(libassert_r)); \

diff --git a/src/analysis.hpp b/src/analysis.hpp
@@ -13,7 +13,7 @@ namespace libassert::detail {
         std::string content;
     };
 
-    LIBASSERT_ATTR_COLD
+    LIBASSERT_ATTR_COLD LIBASSERT_EXPORT /* FIXME */
     std::string highlight(const std::string& expression);
 
     LIBASSERT_ATTR_COLD

diff --git a/src/assert.cpp b/src/assert.cpp
@@ -156,7 +156,7 @@ namespace libassert::detail {
      * system wrappers
      */
 
-    LIBASSERT_ATTR_COLD void enable_virtual_terminal_processing_if_needed() {
+    LIBASSERT_ATTR_COLD LIBASSERT_EXPORT void enable_virtual_terminal_processing_if_needed() {
         // enable colors / ansi processing if necessary
         #if IS_WINDOWS
          // https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences#example-of-enabling-virtual-terminal-processing

diff --git a/tests/demo/demo.cpp b/tests/demo/demo.cpp
@@ -390,7 +390,7 @@ class foo {
 };
 
 namespace libassert::detail {
-    void enable_virtual_terminal_processing_if_needed();
+    LIBASSERT_EXPORT void enable_virtual_terminal_processing_if_needed();
 }
 
 int main() {