mirror of
https://github.com/boostorg/system.git
synced 2026-01-25 00:22:27 +01:00
Avoid allocation on interop for system/generic categories; fix DLL interoperability on msvc-14.x by poking into std::system_category::_Addr
This commit is contained in:
@@ -68,4 +68,4 @@ lib std_single_instance_lib2 : std_single_instance_2.cpp : <link>shared:<define>
|
||||
|
||||
system-run std_single_instance_test.cpp std_single_instance_1.cpp std_single_instance_2.cpp ;
|
||||
run std_single_instance_test.cpp std_single_instance_lib1 std_single_instance_lib2 : : : <link>static : std_single_instance_lib_static ;
|
||||
run std_single_instance_test.cpp std_single_instance_lib1 std_single_instance_lib2 : : : <link>shared : std_single_instance_lib_shared ;
|
||||
run std_single_instance_test.cpp std_single_instance_lib1 std_single_instance_lib2 : : : <link>shared <define>STD_SINGLE_INSTANCE_SHARED : std_single_instance_lib_shared ;
|
||||
|
||||
@@ -31,4 +31,10 @@ EXPORT std::error_code get_generic_code()
|
||||
|
||||
} // namespace lib1
|
||||
|
||||
#else
|
||||
|
||||
EXPORT void lib1_f()
|
||||
{
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -31,4 +31,10 @@ EXPORT std::error_code get_generic_code()
|
||||
|
||||
} // namespace lib2
|
||||
|
||||
#else
|
||||
|
||||
EXPORT void lib2_f()
|
||||
{
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -4,11 +4,31 @@
|
||||
|
||||
#include <boost/system/error_code.hpp>
|
||||
#include <boost/config/pragma_message.hpp>
|
||||
#include <boost/config/helper_macros.hpp>
|
||||
|
||||
#if !defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
|
||||
|
||||
BOOST_PRAGMA_MESSAGE( "BOOST_SYSTEM_HAS_SYSTEM_ERROR not defined, test will be skipped" )
|
||||
int main() {}
|
||||
|
||||
#elif defined(STD_SINGLE_INSTANCE_SHARED) && defined(__CYGWIN__)
|
||||
|
||||
BOOST_PRAGMA_MESSAGE( "Skipping Windows/DLL test, __CYGWIN__" )
|
||||
int main() {}
|
||||
|
||||
#elif defined(STD_SINGLE_INSTANCE_SHARED) && defined(_WIN32) && !defined(_MSC_VER)
|
||||
|
||||
BOOST_PRAGMA_MESSAGE( "Skipping Windows/DLL test, no _MSC_VER" )
|
||||
int main() {}
|
||||
|
||||
#elif defined(STD_SINGLE_INSTANCE_SHARED) && defined(_WIN32) && !defined(_CPPLIB_VER)
|
||||
|
||||
BOOST_PRAGMA_MESSAGE( "Skipping Windows/DLL test, no _CPPLIB_VER" )
|
||||
int main() {}
|
||||
|
||||
#elif defined(STD_SINGLE_INSTANCE_SHARED) && defined(_WIN32) && (_MSC_VER < 1900 || _MSC_VER >= 2000)
|
||||
|
||||
BOOST_PRAGMA_MESSAGE( "Skipping Windows/DLL test, _MSC_VER is " BOOST_STRINGIZE(_MSC_VER) )
|
||||
int main() {}
|
||||
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user