summaryrefslogtreecommitdiff
path: root/libs/phoenix/test/boost_bind_compatibility/bind_dm3_test.cpp
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2015-04-08 03:09:47 +0000
committer <>2015-05-05 14:37:32 +0000
commitf2541bb90af059680aa7036f315f052175999355 (patch)
treea5b214744b256f07e1dc2bd7273035a7808c659f /libs/phoenix/test/boost_bind_compatibility/bind_dm3_test.cpp
parented232fdd34968697a68783b3195b1da4226915b5 (diff)
downloadboost-tarball-master.tar.gz
Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master
Diffstat (limited to 'libs/phoenix/test/boost_bind_compatibility/bind_dm3_test.cpp')
-rw-r--r--libs/phoenix/test/boost_bind_compatibility/bind_dm3_test.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/phoenix/test/boost_bind_compatibility/bind_dm3_test.cpp b/libs/phoenix/test/boost_bind_compatibility/bind_dm3_test.cpp
index ee4bc99dc..d50a4eaf8 100644
--- a/libs/phoenix/test/boost_bind_compatibility/bind_dm3_test.cpp
+++ b/libs/phoenix/test/boost_bind_compatibility/bind_dm3_test.cpp
@@ -41,7 +41,13 @@ int main()
pair_type pair( 10, 20 );
+#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1600) && (BOOST_MSVC < 1700)
+// bind is being confused with 'std::tr1::_Bind' to be found here
+// C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\xxbind1(485)
+ int const & x = boost::phoenix::bind( &pair_type::first, _1 )( pair );
+#else
int const & x = bind( &pair_type::first, _1 )( pair );
+#endif
BOOST_TEST( &pair.first == &x );