summaryrefslogtreecommitdiff
path: root/boost/container/detail/auto_link.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/container/detail/auto_link.hpp')
-rw-r--r--boost/container/detail/auto_link.hpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/boost/container/detail/auto_link.hpp b/boost/container/detail/auto_link.hpp
index da078e8342..264b1ba112 100644
--- a/boost/container/detail/auto_link.hpp
+++ b/boost/container/detail/auto_link.hpp
@@ -18,6 +18,13 @@
# pragma once
#endif
+//Define BOOST_CONTAINER_DYNAMIC_LINKING which is independent from BOOST_*_NO_LIB
+//and is needed is some tests that need to disable some checks (like operator new replacements)
+//that don't work across DLL boundaries
+#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_CONTAINER_DYN_LINK)
+# define BOOST_CONTAINER_DYNAMIC_LINKING
+#endif
+
//
// Automatically link to the correct build variant where possible.
//
@@ -27,12 +34,14 @@
// once it's done with it:
//
#define BOOST_LIB_NAME boost_container
+
//
// If we're importing code from a dll, then tell auto_link.hpp about it:
//
-#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_CONTAINER_DYN_LINK)
+#if defined(BOOST_CONTAINER_DYNAMIC_LINKING)
# define BOOST_DYN_LINK
#endif
+
//
// And include the header that does the work:
//