Merge branch 'develop' into feature/constexpr

This commit is contained in:
Peter Dimov committed 2018-01-22 03:20:23 +02:00
commit 8416ba067f
3 files changed
+5 -5

No files matched your search

+2 -2
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
+2 -2
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