feedc0de/boost_mpl
1
0
Fork 0
forked from boostorg/mpl
Code Pull Requests Activity

Back out fix for VC++8.0

Browse Source
This commit is contained in:
Edward Diener
2018-11-14 11:54:53 -05:00
parent 758a7f6c6a
commit ac67f5952e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/mpl/assert.hpp
View File

@@ -443,8 +443,9 @@ BOOST_MPL_AUX_ASSERT_CONSTANT( \
/**/ /**/
#endif #endif
#if 0
// Work around BOOST_MPL_ASSERT_MSG_IMPL generating multiple definition linker errors on VC++8. // Work around BOOST_MPL_ASSERT_MSG_IMPL generating multiple definition linker errors on VC++8.
#if defined(BOOST_MSVC) && BOOST_MSVC < 1500 // #if defined(BOOST_MSVC) && BOOST_MSVC < 1500
# include <boost/static_assert.hpp> # include <boost/static_assert.hpp>
# define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \ # define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \
BOOST_STATIC_ASSERT_MSG( c, #msg ) \ BOOST_STATIC_ASSERT_MSG( c, #msg ) \

2
test/Jamfile.v2
View File

@@ -13,7 +13,7 @@ compile apply_wrap.cpp ;
compile arithmetic.cpp ; compile arithmetic.cpp ;
compile as_sequence.cpp ; compile as_sequence.cpp ;
compile assert.cpp ; compile assert.cpp ;
link assert_vc8_p1.cpp assert_vc8_p2.cpp ; # link assert_vc8_p1.cpp assert_vc8_p2.cpp ;
compile at.cpp ; compile at.cpp ;
compile back.cpp ; compile back.cpp ;
compile bind.cpp ; compile bind.cpp ;