2
0
mirror of https://github.com/boostorg/phoenix.git synced 2026-02-18 14:22:09 +00:00

querying_find and querying_find2 revise tests

This commit is contained in:
John Fletcher
2015-03-23 09:33:09 +00:00
parent 38836d4ee6
commit e04b6f0e0a
2 changed files with 17 additions and 23 deletions

View File

@@ -13,8 +13,14 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/phoenix/config.hpp>
#include <boost/config.hpp>
#if defined(BOOST_DINKUMWARE_STDLIB) && (BOOST_DINKUMWARE_STDLIB < 610)
#include <hash_set>
#include <hash_map>
#define BOOST_PHOENIX_HAS_HASH
#define BOOST_PHOENIX_HASH_NAMESPACE stdext
#else
#if (defined (BOOST_NO_CXX11_HDR_UNORDERED_MAP) || \
defined (BOOST_NO_CXX11_HDR_UNORDERED_SET) )
#ifdef BOOST_HAS_HASH
@@ -24,23 +30,15 @@
#define _GLIBCXX_PERMIT_BACKWARD_HASH
#include BOOST_HASH_SET_HEADER
#include BOOST_HASH_MAP_HEADER
//#else
//#include <backward/hash_set>
//#include <backward/hash_map>
//#endif
#define BOOST_PHOENIX_HAS_HASH
#define BOOST_PHOENIX_HASH_NAMESPACE BOOST_STD_EXTENSION_NAMESPACE
#elif defined(BOOST_DINKUMWARE_STDLIB) && (BOOST_DINKUMWARE_STDLIB < 610)
#include <hash_set>
#include <hash_map>
#define BOOST_PHOENIX_HAS_HASH
#define BOOST_PHOENIX_HASH_NAMESPACE stdext
#endif
#else
#define BOOST_PHOENIX_HAS_UNORDERED_SET_AND_MAP
#include <unordered_set>
#include <unordered_map>
#endif
#endif
#include <set>
#include <map>
@@ -82,15 +80,6 @@ namespace
BOOST_TEST(boost::phoenix::find(arg1, 2)(m) == m.find(2));
//#endif
#ifdef BOOST_PHOENIX_HAS_UNORDERED_SET_AND_MAP
std::unordered_set<int> hs(array, array + 3);
BOOST_TEST(boost::phoenix::find(arg1, 2)(hs) == hs.find(2));
//std::unordered_map<int, int> hm = boost::assign::map_list_of(0, 1)(2, 3)(4, 5).
// convert_to_container<std::unordered_map<int, int> >();
// BOOST_TEST(boost::phoenix::find(arg1, 2)(hm) == hm.find(2));
#else
#ifdef BOOST_PHOENIX_HAS_HASH
BOOST_PHOENIX_HASH_NAMESPACE::hash_set<int> hs(array, array + 3);
@@ -100,7 +89,14 @@ namespace
convert_to_container<BOOST_PHOENIX_HASH_NAMESPACE::hash_map<int, int> >();
BOOST_TEST(boost::phoenix::find(arg1, 2)(hm) == hm.find(2));
#endif
#elif defined BOOST_PHOENIX_HAS_UNORDERED_SET_AND_MAP
std::unordered_set<int> us(array, array + 3);
BOOST_TEST(boost::phoenix::find(arg1, 2)(us) == us.find(2));
std::unordered_map<int, int> um = boost::assign::map_list_of(0, 1)(2, 3)(4, 5).
convert_to_container<std::unordered_map<int, int> >();
BOOST_TEST(boost::phoenix::find(arg1, 2)(um) == um.find(2));
#endif
return;
}