diff --git a/contrib/autoboost/autoboost/archive/detail/auto_link_archive.hpp b/contrib/autoboost/autoboost/archive/detail/auto_link_archive.hpp index 6b80fa584..5545d10ba 100644 --- a/contrib/autoboost/autoboost/archive/detail/auto_link_archive.hpp +++ b/contrib/autoboost/autoboost/archive/detail/auto_link_archive.hpp @@ -25,24 +25,4 @@ #include -#if !defined(AUTOBOOST_ALL_NO_LIB) && !defined(AUTOBOOST_SERIALIZATION_NO_LIB) \ -&& !defined(AUTOBOOST_ARCHIVE_SOURCE) && !defined(AUTOBOOST_WARCHIVE_SOURCE) \ -&& !defined(AUTOBOOST_SERIALIZATION_SOURCE) - - // Set the name of our library, this will get undef'ed by auto_link.hpp - // once it's done with it: - // - #define AUTOBOOST_LIB_NAME autoboost_serialization - // - // If we're importing code from a dll, then tell auto_link.hpp about it: - // - #if defined(AUTOBOOST_ALL_DYN_LINK) || defined(AUTOBOOST_SERIALIZATION_DYN_LINK) - # define AUTOBOOST_DYN_LINK - #endif - // - // And include the header that does the work: - // - #include -#endif // auto-linking disabled - #endif // AUTOBOOST_ARCHIVE_DETAIL_AUTO_LINK_ARCHIVE_HPP diff --git a/contrib/autoboost/autoboost/archive/detail/auto_link_warchive.hpp b/contrib/autoboost/autoboost/archive/detail/auto_link_warchive.hpp index 304d3fa32..30d1edbf6 100644 --- a/contrib/autoboost/autoboost/archive/detail/auto_link_warchive.hpp +++ b/contrib/autoboost/autoboost/archive/detail/auto_link_warchive.hpp @@ -25,23 +25,4 @@ #include -#if !defined(AUTOBOOST_WARCHIVE_SOURCE) \ -&& !defined(AUTOBOOST_ALL_NO_LIB) && !defined(AUTOBOOST_SERIALIZATION_NO_LIB) - -// Set the name of our library, this will get undef'ed by auto_link.hpp -// once it's done with it: -// -#define AUTOBOOST_LIB_NAME autoboost_wserialization -// -// If we're importing code from a dll, then tell auto_link.hpp about it: -// -#if defined(AUTOBOOST_ALL_DYN_LINK) || defined(AUTOBOOST_SERIALIZATION_DYN_LINK) -# define AUTOBOOST_DYN_LINK -#endif -// -// And include the header that does the work: -// -#include -#endif // auto-linking disabled - #endif // ARCHIVE_DETAIL_AUTO_LINK_ARCHIVE_HPP diff --git a/contrib/autoboost/autoboost/atomic/detail/link.hpp b/contrib/autoboost/autoboost/atomic/detail/link.hpp index 7290c71b2..8a88b35a6 100644 --- a/contrib/autoboost/autoboost/atomic/detail/link.hpp +++ b/contrib/autoboost/autoboost/atomic/detail/link.hpp @@ -39,20 +39,4 @@ #define AUTOBOOST_ATOMIC_DECL #endif -/////////////////////////////////////////////////////////////////////////////// -// Auto library naming -#if !defined(AUTOBOOST_ATOMIC_SOURCE) && !defined(AUTOBOOST_ALL_NO_LIB) && \ - !defined(AUTOBOOST_ATOMIC_NO_LIB) - -#define AUTOBOOST_LIB_NAME autoboost_atomic - -// tell the auto-link code to select a dll when required: -#if defined(AUTOBOOST_ALL_DYN_LINK) || defined(AUTOBOOST_ATOMIC_DYN_LINK) -#define AUTOBOOST_DYN_LINK -#endif - -#include - -#endif // auto-linking disabled - #endif diff --git a/contrib/autoboost/autoboost/chrono/config.hpp b/contrib/autoboost/autoboost/chrono/config.hpp index 2ce897f12..96cf61bfc 100644 --- a/contrib/autoboost/autoboost/chrono/config.hpp +++ b/contrib/autoboost/autoboost/chrono/config.hpp @@ -192,25 +192,6 @@ -// enable automatic library variant selection ------------------------------// - -#if !defined(AUTOBOOST_CHRONO_SOURCE) && !defined(AUTOBOOST_ALL_NO_LIB) && !defined(AUTOBOOST_CHRONO_NO_LIB) -// -// Set the name of our library; this will get undef'ed by auto_link.hpp -// once it's done with it: -// -#define AUTOBOOST_LIB_NAME autoboost_chrono -// -// If we're importing code from a dll, then tell auto_link.hpp about it: -// -#if defined(AUTOBOOST_ALL_DYN_LINK) || defined(AUTOBOOST_CHRONO_DYN_LINK) -# define AUTOBOOST_DYN_LINK -#endif -// -// And include the header that does the work: -// -#include -#endif // auto-linking disabled #endif // AUTOBOOST_CHRONO_HEADER_ONLY #endif // AUTOBOOST_CHRONO_CONFIG_HPP diff --git a/contrib/autoboost/autoboost/config/auto_link.hpp b/contrib/autoboost/autoboost/config/auto_link.hpp deleted file mode 100644 index a3c8e02a6..000000000 --- a/contrib/autoboost/autoboost/config/auto_link.hpp +++ /dev/null @@ -1,439 +0,0 @@ -// (C) Copyright John Maddock 2003. -// Use, modification and distribution are subject to the -// Boost Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - /* - * LOCATION: see http://www.boost.org for most recent version. - * FILE auto_link.hpp - * VERSION see - * DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers. - */ - -/************************************************************************* - -USAGE: -~~~~~~ - -Before including this header you must define one or more of define the following macros: - -AUTOBOOST_LIB_NAME: Required: A string containing the basename of the library, - for example boost_regex. -AUTOBOOST_LIB_TOOLSET: Optional: the base name of the toolset. -AUTOBOOST_DYN_LINK: Optional: when set link to dll rather than static library. -AUTOBOOST_LIB_DIAGNOSTIC: Optional: when set the header will print out the name - of the library selected (useful for debugging). -AUTOBOOST_AUTO_LINK_NOMANGLE: Specifies that we should link to AUTOBOOST_LIB_NAME.lib, - rather than a mangled-name version. -AUTOBOOST_AUTO_LINK_TAGGED: Specifies that we link to libraries built with the --layout=tagged option. - This is essentially the same as the default name-mangled version, but without - the compiler name and version, or the Boost version. Just the build options. - -These macros will be undef'ed at the end of the header, further this header -has no include guards - so be sure to include it only once from your library! - -Algorithm: -~~~~~~~~~~ - -Libraries for Borland and Microsoft compilers are automatically -selected here, the name of the lib is selected according to the following -formula: - -AUTOBOOST_LIB_PREFIX - + AUTOBOOST_LIB_NAME - + "_" - + AUTOBOOST_LIB_TOOLSET - + AUTOBOOST_LIB_THREAD_OPT - + AUTOBOOST_LIB_RT_OPT - "-" - + AUTOBOOST_LIB_VERSION - -These are defined as: - -AUTOBOOST_LIB_PREFIX: "lib" for static libraries otherwise "". - -AUTOBOOST_LIB_NAME: The base name of the lib ( for example boost_regex). - -AUTOBOOST_LIB_TOOLSET: The compiler toolset name (vc6, vc7, bcb5 etc). - -AUTOBOOST_LIB_THREAD_OPT: "-mt" for multithread builds, otherwise nothing. - -AUTOBOOST_LIB_RT_OPT: A suffix that indicates the runtime library used, - contains one or more of the following letters after - a hyphen: - - s static runtime (dynamic if not present). - g debug/diagnostic runtime (release if not present). - y Python debug/diagnostic runtime (release if not present). - d debug build (release if not present). - p STLport build. - n STLport build without its IOStreams. - -AUTOBOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. - - -***************************************************************************/ - -#ifdef __cplusplus -# ifndef AUTOBOOST_CONFIG_HPP -# include -# endif -#elif defined(_MSC_VER) && !defined(__MWERKS__) && !defined(__EDG_VERSION__) -// -// C language compatability (no, honestly) -// -# define AUTOBOOST_MSVC _MSC_VER -# define AUTOBOOST_STRINGIZE(X) AUTOBOOST_DO_STRINGIZE(X) -# define AUTOBOOST_DO_STRINGIZE(X) #X -#endif -// -// Only include what follows for known and supported compilers: -// -#if defined(AUTOBOOST_MSVC) \ - || defined(__BORLANDC__) \ - || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \ - || (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200)) - -#ifndef AUTOBOOST_VERSION_HPP -# include -#endif - -#ifndef AUTOBOOST_LIB_NAME -# error "Macro AUTOBOOST_LIB_NAME not set (internal error)" -#endif - -// -// error check: -// -#if defined(__MSVC_RUNTIME_CHECKS) && !defined(_DEBUG) -# pragma message("Using the /RTC option without specifying a debug runtime will lead to linker errors") -# pragma message("Hint: go to the code generation options and switch to one of the debugging runtimes") -# error "Incompatible build options" -#endif -// -// select toolset if not defined already: -// -#ifndef AUTOBOOST_LIB_TOOLSET -# if defined(AUTOBOOST_MSVC) && (AUTOBOOST_MSVC < 1200) - // Note: no compilers before 1200 are supported -# elif defined(AUTOBOOST_MSVC) && (AUTOBOOST_MSVC < 1300) - -# ifdef UNDER_CE - // eVC4: -# define AUTOBOOST_LIB_TOOLSET "evc4" -# else - // vc6: -# define AUTOBOOST_LIB_TOOLSET "vc6" -# endif - -# elif defined(AUTOBOOST_MSVC) && (AUTOBOOST_MSVC < 1310) - - // vc7: -# define AUTOBOOST_LIB_TOOLSET "vc7" - -# elif defined(AUTOBOOST_MSVC) && (AUTOBOOST_MSVC < 1400) - - // vc71: -# define AUTOBOOST_LIB_TOOLSET "vc71" - -# elif defined(AUTOBOOST_MSVC) && (AUTOBOOST_MSVC < 1500) - - // vc80: -# define AUTOBOOST_LIB_TOOLSET "vc80" - -# elif defined(AUTOBOOST_MSVC) && (AUTOBOOST_MSVC < 1600) - - // vc90: -# define AUTOBOOST_LIB_TOOLSET "vc90" - -# elif defined(AUTOBOOST_MSVC) && (AUTOBOOST_MSVC < 1700) - - // vc10: -# define AUTOBOOST_LIB_TOOLSET "vc100" - -# elif defined(AUTOBOOST_MSVC) && (AUTOBOOST_MSVC < 1800) - - // vc11: -# define AUTOBOOST_LIB_TOOLSET "vc110" - -# elif defined(AUTOBOOST_MSVC) && (AUTOBOOST_MSVC < 1900) - - // vc12: -# define AUTOBOOST_LIB_TOOLSET "vc120" - -# elif defined(AUTOBOOST_MSVC) - - // vc14: -# define AUTOBOOST_LIB_TOOLSET "vc140" - -# elif defined(__BORLANDC__) - - // CBuilder 6: -# define AUTOBOOST_LIB_TOOLSET "bcb" - -# elif defined(__ICL) - - // Intel C++, no version number: -# define AUTOBOOST_LIB_TOOLSET "iw" - -# elif defined(__MWERKS__) && (__MWERKS__ <= 0x31FF ) - - // Metrowerks CodeWarrior 8.x -# define AUTOBOOST_LIB_TOOLSET "cw8" - -# elif defined(__MWERKS__) && (__MWERKS__ <= 0x32FF ) - - // Metrowerks CodeWarrior 9.x -# define AUTOBOOST_LIB_TOOLSET "cw9" - -# endif -#endif // AUTOBOOST_LIB_TOOLSET - -// -// select thread opt: -// -#if defined(_MT) || defined(__MT__) -# define AUTOBOOST_LIB_THREAD_OPT "-mt" -#else -# define AUTOBOOST_LIB_THREAD_OPT -#endif - -#if defined(_MSC_VER) || defined(__MWERKS__) - -# ifdef _DLL - -# if (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) && (defined(_STLP_OWN_IOSTREAMS) || defined(__STL_OWN_IOSTREAMS)) - -# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG))\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-gydp" -# elif defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) -# define AUTOBOOST_LIB_RT_OPT "-gdp" -# elif defined(_DEBUG)\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-gydp" -# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" -# elif defined(_DEBUG) -# define AUTOBOOST_LIB_RT_OPT "-gdp" -# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" -# else -# define AUTOBOOST_LIB_RT_OPT "-p" -# endif - -# elif defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) - -# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG))\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-gydpn" -# elif defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) -# define AUTOBOOST_LIB_RT_OPT "-gdpn" -# elif defined(_DEBUG)\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-gydpn" -# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" -# elif defined(_DEBUG) -# define AUTOBOOST_LIB_RT_OPT "-gdpn" -# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" -# else -# define AUTOBOOST_LIB_RT_OPT "-pn" -# endif - -# else - -# if defined(_DEBUG) && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-gyd" -# elif defined(_DEBUG) -# define AUTOBOOST_LIB_RT_OPT "-gd" -# else -# define AUTOBOOST_LIB_RT_OPT -# endif - -# endif - -# else - -# if (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) && (defined(_STLP_OWN_IOSTREAMS) || defined(__STL_OWN_IOSTREAMS)) - -# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG))\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-sgydp" -# elif defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) -# define AUTOBOOST_LIB_RT_OPT "-sgdp" -# elif defined(_DEBUG)\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-sgydp" -# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" -# elif defined(_DEBUG) -# define AUTOBOOST_LIB_RT_OPT "-sgdp" -# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" -# else -# define AUTOBOOST_LIB_RT_OPT "-sp" -# endif - -# elif defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) - -# if defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG))\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-sgydpn" -# elif defined(_DEBUG) && (defined(__STL_DEBUG) || defined(_STLP_DEBUG)) -# define AUTOBOOST_LIB_RT_OPT "-sgdpn" -# elif defined(_DEBUG)\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-sgydpn" -# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" -# elif defined(_DEBUG) -# define AUTOBOOST_LIB_RT_OPT "-sgdpn" -# pragma message("warning: STLport debug versions are built with /D_STLP_DEBUG=1") -# error "Build options aren't compatible with pre-built libraries" -# else -# define AUTOBOOST_LIB_RT_OPT "-spn" -# endif - -# else - -# if defined(_DEBUG)\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-sgyd" -# elif defined(_DEBUG) -# define AUTOBOOST_LIB_RT_OPT "-sgd" -# else -# define AUTOBOOST_LIB_RT_OPT "-s" -# endif - -# endif - -# endif - -#elif defined(__BORLANDC__) - -// -// figure out whether we want the debug builds or not: -// -#if __BORLANDC__ > 0x561 -#pragma defineonoption AUTOBOOST_BORLAND_DEBUG -v -#endif -// -// sanity check: -// -#if defined(__STL_DEBUG) || defined(_STLP_DEBUG) -#error "Pre-built versions of the Boost libraries are not provided in STLport-debug form" -#endif - -# ifdef _RTLDLL - -# if defined(AUTOBOOST_BORLAND_DEBUG)\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-yd" -# elif defined(AUTOBOOST_BORLAND_DEBUG) -# define AUTOBOOST_LIB_RT_OPT "-d" -# elif defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT -y -# else -# define AUTOBOOST_LIB_RT_OPT -# endif - -# else - -# if defined(AUTOBOOST_BORLAND_DEBUG)\ - && defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-syd" -# elif defined(AUTOBOOST_BORLAND_DEBUG) -# define AUTOBOOST_LIB_RT_OPT "-sd" -# elif defined(AUTOBOOST_DEBUG_PYTHON) && defined(AUTOBOOST_LINKING_PYTHON) -# define AUTOBOOST_LIB_RT_OPT "-sy" -# else -# define AUTOBOOST_LIB_RT_OPT "-s" -# endif - -# endif - -#endif - -// -// select linkage opt: -// -#if (defined(_DLL) || defined(_RTLDLL)) && defined(AUTOBOOST_DYN_LINK) -# define AUTOBOOST_LIB_PREFIX -#elif defined(AUTOBOOST_DYN_LINK) -# error "Mixing a dll boost library with a static runtime is a really bad idea..." -#else -# define AUTOBOOST_LIB_PREFIX "lib" -#endif - -// -// now include the lib: -// -#if defined(AUTOBOOST_LIB_NAME) \ - && defined(AUTOBOOST_LIB_PREFIX) \ - && defined(AUTOBOOST_LIB_TOOLSET) \ - && defined(AUTOBOOST_LIB_THREAD_OPT) \ - && defined(AUTOBOOST_LIB_RT_OPT) \ - && defined(AUTOBOOST_LIB_VERSION) - -#ifdef AUTOBOOST_AUTO_LINK_TAGGED -# pragma comment(lib, AUTOBOOST_LIB_PREFIX AUTOBOOST_STRINGIZE(AUTOBOOST_LIB_NAME) AUTOBOOST_LIB_THREAD_OPT AUTOBOOST_LIB_RT_OPT ".lib") -# ifdef AUTOBOOST_LIB_DIAGNOSTIC -# pragma message ("Linking to lib file: " AUTOBOOST_LIB_PREFIX AUTOBOOST_STRINGIZE(AUTOBOOST_LIB_NAME) AUTOBOOST_LIB_THREAD_OPT AUTOBOOST_LIB_RT_OPT ".lib") -# endif -#elif defined(AUTOBOOST_AUTO_LINK_NOMANGLE) -# pragma comment(lib, AUTOBOOST_STRINGIZE(AUTOBOOST_LIB_NAME) ".lib") -# ifdef AUTOBOOST_LIB_DIAGNOSTIC -# pragma message ("Linking to lib file: " AUTOBOOST_STRINGIZE(AUTOBOOST_LIB_NAME) ".lib") -# endif -#elif defined(AUTOBOOST_LIB_BUILDID) -# pragma comment(lib, AUTOBOOST_LIB_PREFIX AUTOBOOST_STRINGIZE(AUTOBOOST_LIB_NAME) "-" AUTOBOOST_LIB_TOOLSET AUTOBOOST_LIB_THREAD_OPT AUTOBOOST_LIB_RT_OPT "-" AUTOBOOST_LIB_VERSION "-" AUTOBOOST_STRINGIZE(AUTOBOOST_LIB_BUILDID) ".lib") -# ifdef AUTOBOOST_LIB_DIAGNOSTIC -# pragma message ("Linking to lib file: " AUTOBOOST_LIB_PREFIX AUTOBOOST_STRINGIZE(AUTOBOOST_LIB_NAME) "-" AUTOBOOST_LIB_TOOLSET AUTOBOOST_LIB_THREAD_OPT AUTOBOOST_LIB_RT_OPT "-" AUTOBOOST_LIB_VERSION "-" AUTOBOOST_STRINGIZE(AUTOBOOST_LIB_BUILDID) ".lib") -# endif -#else -# pragma comment(lib, AUTOBOOST_LIB_PREFIX AUTOBOOST_STRINGIZE(AUTOBOOST_LIB_NAME) "-" AUTOBOOST_LIB_TOOLSET AUTOBOOST_LIB_THREAD_OPT AUTOBOOST_LIB_RT_OPT "-" AUTOBOOST_LIB_VERSION ".lib") -# ifdef AUTOBOOST_LIB_DIAGNOSTIC -# pragma message ("Linking to lib file: " AUTOBOOST_LIB_PREFIX AUTOBOOST_STRINGIZE(AUTOBOOST_LIB_NAME) "-" AUTOBOOST_LIB_TOOLSET AUTOBOOST_LIB_THREAD_OPT AUTOBOOST_LIB_RT_OPT "-" AUTOBOOST_LIB_VERSION ".lib") -# endif -#endif - -#else -# error "some required macros where not defined (internal logic error)." -#endif - - -#endif // _MSC_VER || __BORLANDC__ - -// -// finally undef any macros we may have set: -// -#ifdef AUTOBOOST_LIB_PREFIX -# undef AUTOBOOST_LIB_PREFIX -#endif -#if defined(AUTOBOOST_LIB_NAME) -# undef AUTOBOOST_LIB_NAME -#endif -// Don't undef this one: it can be set by the user and should be the -// same for all libraries: -//#if defined(AUTOBOOST_LIB_TOOLSET) -//# undef AUTOBOOST_LIB_TOOLSET -//#endif -#if defined(AUTOBOOST_LIB_THREAD_OPT) -# undef AUTOBOOST_LIB_THREAD_OPT -#endif -#if defined(AUTOBOOST_LIB_RT_OPT) -# undef AUTOBOOST_LIB_RT_OPT -#endif -#if defined(AUTOBOOST_LIB_LINK_OPT) -# undef AUTOBOOST_LIB_LINK_OPT -#endif -#if defined(AUTOBOOST_LIB_DEBUG_OPT) -# undef AUTOBOOST_LIB_DEBUG_OPT -#endif -#if defined(AUTOBOOST_DYN_LINK) -# undef AUTOBOOST_DYN_LINK -#endif - - diff --git a/contrib/autoboost/autoboost/context/detail/config.hpp b/contrib/autoboost/autoboost/context/detail/config.hpp index 49f30962b..167ed4f84 100644 --- a/contrib/autoboost/autoboost/context/detail/config.hpp +++ b/contrib/autoboost/autoboost/context/detail/config.hpp @@ -27,14 +27,6 @@ # define AUTOBOOST_CONTEXT_DECL #endif -#if ! defined(AUTOBOOST_CONTEXT_SOURCE) && ! defined(AUTOBOOST_ALL_NO_LIB) && ! defined(AUTOBOOST_CONTEXT_NO_LIB) -# define AUTOBOOST_LIB_NAME autoboost_context -# if defined(AUTOBOOST_ALL_DYN_LINK) || defined(AUTOBOOST_CONTEXT_DYN_LINK) -# define AUTOBOOST_DYN_LINK -# endif -# include -#endif - #undef AUTOBOOST_CONTEXT_CALLDECL #if (defined(i386) || defined(__i386__) || defined(__i386) \ || defined(__i486__) || defined(__i586__) || defined(__i686__) \ diff --git a/contrib/autoboost/autoboost/date_time/compiler_config.hpp b/contrib/autoboost/autoboost/date_time/compiler_config.hpp index 2e876e151..5fc4e2293 100644 --- a/contrib/autoboost/autoboost/date_time/compiler_config.hpp +++ b/contrib/autoboost/autoboost/date_time/compiler_config.hpp @@ -136,27 +136,6 @@ namespace std { # define AUTOBOOST_DATE_TIME_DECL #endif -// -// Automatically link to the correct build variant where possible. -// -#if !defined(AUTOBOOST_ALL_NO_LIB) && !defined(AUTOBOOST_DATE_TIME_NO_LIB) && !defined(AUTOBOOST_DATE_TIME_SOURCE) -// -// Set the name of our library, this will get undef'ed by auto_link.hpp -// once it's done with it: -// -#define AUTOBOOST_LIB_NAME autoboost_date_time -// -// If we're importing code from a dll, then tell auto_link.hpp about it: -// -#if defined(AUTOBOOST_ALL_DYN_LINK) || defined(AUTOBOOST_DATE_TIME_DYN_LINK) -# define AUTOBOOST_DYN_LINK -#endif -// -// And include the header that does the work: -// -#include -#endif // auto-linking disabled - #if defined(AUTOBOOST_HAS_THREADS) # if defined(_MSC_VER) || defined(__MWERKS__) || defined(__MINGW32__) || defined(__BORLANDC__) //no reentrant posix functions (eg: localtime_r) diff --git a/contrib/autoboost/autoboost/regex/config.hpp b/contrib/autoboost/autoboost/regex/config.hpp index ca3f2e15a..9ae4a25b1 100644 --- a/contrib/autoboost/autoboost/regex/config.hpp +++ b/contrib/autoboost/autoboost/regex/config.hpp @@ -207,17 +207,6 @@ # define AUTOBOOST_REGEX_DECL #endif -#if !defined(AUTOBOOST_REGEX_NO_LIB) && !defined(AUTOBOOST_REGEX_SOURCE) && !defined(AUTOBOOST_ALL_NO_LIB) && defined(__cplusplus) -# define AUTOBOOST_LIB_NAME autoboost_regex -# if defined(AUTOBOOST_REGEX_DYN_LINK) || defined(AUTOBOOST_ALL_DYN_LINK) -# define AUTOBOOST_DYN_LINK -# endif -# ifdef AUTOBOOST_REGEX_DIAG -# define AUTOBOOST_LIB_DIAGNOSTIC -# endif -# include -#endif - /***************************************************************************** * * Set up function call type: diff --git a/contrib/autoboost/autoboost/serialization/config.hpp b/contrib/autoboost/autoboost/serialization/config.hpp index 0c4557dba..5d113d063 100644 --- a/contrib/autoboost/autoboost/serialization/config.hpp +++ b/contrib/autoboost/autoboost/serialization/config.hpp @@ -59,27 +59,4 @@ #define AUTOBOOST_SERIALIZATION_DECL(T) T #endif -// enable automatic library variant selection ------------------------------// - -#if !defined(AUTOBOOST_ALL_NO_LIB) && !defined(AUTOBOOST_SERIALIZATION_NO_LIB) \ -&& !defined(AUTOBOOST_ARCHIVE_SOURCE) && !defined(AUTOBOOST_WARCHIVE_SOURCE) \ -&& !defined(AUTOBOOST_SERIALIZATION_SOURCE) - // - // Set the name of our library, this will get undef'ed by auto_link.hpp - // once it's done with it: - // - #define AUTOBOOST_LIB_NAME autoboost_serialization - // - // If we're importing code from a dll, then tell auto_link.hpp about it: - // - #if defined(AUTOBOOST_ALL_DYN_LINK) || defined(AUTOBOOST_SERIALIZATION_DYN_LINK) - # define AUTOBOOST_DYN_LINK - #endif - // - // And include the header that does the work: - // - #include - -#endif - #endif // AUTOBOOST_SERIALIZATION_CONFIG_HPP diff --git a/contrib/autoboost/autoboost/system/config.hpp b/contrib/autoboost/autoboost/system/config.hpp index 44fb6f81c..bd6911647 100644 --- a/contrib/autoboost/autoboost/system/config.hpp +++ b/contrib/autoboost/autoboost/system/config.hpp @@ -46,25 +46,5 @@ # define AUTOBOOST_SYSTEM_DECL #endif -// enable automatic library variant selection ----------------------------------------// - -#if !defined(AUTOBOOST_SYSTEM_SOURCE) && !defined(AUTOBOOST_ALL_NO_LIB) && !defined(AUTOBOOST_SYSTEM_NO_LIB) -// -// Set the name of our library, this will get undef'ed by auto_link.hpp -// once it's done with it: -// -#define AUTOBOOST_LIB_NAME autoboost_system -// -// If we're importing code from a dll, then tell auto_link.hpp about it: -// -#if defined(AUTOBOOST_ALL_DYN_LINK) || defined(AUTOBOOST_SYSTEM_DYN_LINK) -# define AUTOBOOST_DYN_LINK -#endif -// -// And include the header that does the work: -// -#include -#endif // auto-linking disabled - #endif // AUTOBOOST_SYSTEM_CONFIG_HPP diff --git a/contrib/autoboost/autoboost/thread/detail/config.hpp b/contrib/autoboost/autoboost/thread/detail/config.hpp index 59f72949c..57a3045fe 100644 --- a/contrib/autoboost/autoboost/thread/detail/config.hpp +++ b/contrib/autoboost/autoboost/thread/detail/config.hpp @@ -428,34 +428,6 @@ # define AUTOBOOST_THREAD_DECL #endif // AUTOBOOST_HAS_DECLSPEC -// -// Automatically link to the correct build variant where possible. -// -#if !defined(AUTOBOOST_ALL_NO_LIB) && !defined(AUTOBOOST_THREAD_NO_LIB) && !defined(AUTOBOOST_THREAD_BUILD_DLL) && !defined(AUTOBOOST_THREAD_BUILD_LIB) -// -// Tell the autolink to link dynamically, this will get undef'ed by auto_link.hpp -// once it's done with it: -// -#if defined(AUTOBOOST_THREAD_USE_DLL) -# define AUTOBOOST_DYN_LINK -#endif -// -// Set the name of our library, this will get undef'ed by auto_link.hpp -// once it's done with it: -// -#if defined(AUTOBOOST_THREAD_LIB_NAME) -# define AUTOBOOST_LIB_NAME AUTOBOOST_THREAD_LIB_NAME -#else -# define AUTOBOOST_LIB_NAME autoboost_thread -#endif -// -// If we're importing code from a dll, then tell auto_link.hpp about it: -// -// And include the header that does the work: -// -#include -#endif // auto-linking disabled - #endif // AUTOBOOST_THREAD_CONFIG_WEK1032003_HPP // Change Log: diff --git a/contrib/autoboost/autoboost/version.hpp b/contrib/autoboost/autoboost/version.hpp index 837a9144c..5f428417d 100644 --- a/contrib/autoboost/autoboost/version.hpp +++ b/contrib/autoboost/autoboost/version.hpp @@ -25,7 +25,6 @@ // AUTOBOOST_LIB_VERSION must be defined to be the same as AUTOBOOST_VERSION // but as a *string* in the form "x_y[_z]" where x is the major version // number, y is the minor version number, and z is the patch level if not 0. -// This is used by to select which library version to link to. #define AUTOBOOST_LIB_VERSION "1_57"