diff options
Diffstat (limited to 'libs/phoenix/test/algorithm/querying.cpp')
| -rw-r--r-- | libs/phoenix/test/algorithm/querying.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/phoenix/test/algorithm/querying.cpp b/libs/phoenix/test/algorithm/querying.cpp index 43f588c40..2ab97c638 100644 --- a/libs/phoenix/test/algorithm/querying.cpp +++ b/libs/phoenix/test/algorithm/querying.cpp @@ -2,8 +2,9 @@ Copyright (c) 2005 Dan Marsden Copyright (c) 2005-2007 Joel de Guzman Copyright (c) 2007 Hartmut Kaiser + Copyright (c) 2015 John Fletcher - Distributed under the Boost Software License, Version 1.0. (See accompanying + Distributed under 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) ==============================================================================*/ @@ -15,11 +16,12 @@ #include <boost/config.hpp> #ifdef BOOST_HAS_HASH +#define _GLIBCXX_PERMIT_BACKWARD_HASH #include BOOST_HASH_SET_HEADER #include BOOST_HASH_MAP_HEADER #define BOOST_PHOENIX_HAS_HASH #define BOOST_PHOENIX_HASH_NAMESPACE BOOST_STD_EXTENSION_NAMESPACE -#elif defined(BOOST_DINKUMWARE_STDLIB) +#elif defined(BOOST_DINKUMWARE_STDLIB) && (BOOST_DINKUMWARE_STDLIB < 610) #include <hash_set> #include <hash_map> #define BOOST_PHOENIX_HAS_HASH @@ -59,8 +61,10 @@ namespace std::set<int> s(array, array + 3); BOOST_TEST(boost::phoenix::find(arg1, 2)(s) == s.find(2)); +#if !(defined(BOOST_MSVC) && (BOOST_MSVC >= 1900)) std::map<int, int> m = boost::assign::map_list_of(0, 1)(2, 3)(4, 5); BOOST_TEST(boost::phoenix::find(arg1, 2)(m) == m.find(2)); +#endif #ifdef BOOST_PHOENIX_HAS_HASH |