Merge branch 'develop' into feature/constexpr

This commit is contained in:
Peter Dimov
2018-01-22 03:20:23 +02:00
3 changed files with 5 additions and 5 deletions

View File

@@ -70,4 +70,4 @@ build: off
test_script:
- PATH=%ADDPATH%%PATH%
- if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
- b2 -j3 libs/system/test toolset=%TOOLSET% %CXXSTD%
- b2 -j3 libs/system/test toolset=%TOOLSET% variant=debug,release %CXXSTD%

View File

@@ -4,8 +4,8 @@
#include <boost/config.hpp>
#if defined(SINGLE_INSTANCE_DYN_LINK) && defined(BOOST_HAS_DECLSPEC)
# define EXPORT __declspec(dllexport)
#if defined(SINGLE_INSTANCE_DYN_LINK)
# define EXPORT BOOST_SYMBOL_EXPORT
#else
# define EXPORT
#endif

View File

@@ -4,8 +4,8 @@
#include <boost/config.hpp>
#if defined(SINGLE_INSTANCE_DYN_LINK) && defined(BOOST_HAS_DECLSPEC)
# define EXPORT __declspec(dllexport)
#if defined(SINGLE_INSTANCE_DYN_LINK)
# define EXPORT BOOST_SYMBOL_EXPORT
#else
# define EXPORT
#endif