boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-30 03:17:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reinstate boost::unordered::piecewise_construct

Browse Source 
Maintain backwards-compatibility for users instead of forcing them to change to `std::`
This commit is contained in:
Christian Mazakas
2023-09-21 15:44:05 -07:00
parent 3f3b2128ec
commit 9b1ec6cbce
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/unordered/detail/fwd.hpp
View File

@ -15,6 +15,7 @@
#include <boost/predef.h> #include <boost/predef.h>
#include <utility> #include <utility>
#include <tuple>
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Configuration // Configuration
@ -35,6 +36,11 @@
#endif #endif
#endif #endif
#include <tuple> namespace boost {
namespace unordered {
using std::piecewise_construct;
using std::piecewise_construct_t;
} // namespace unordered
} // namespace boost
#endif #endif

30
test/unordered/insert_tests.cpp
View File

@ -1362,7 +1362,7 @@ namespace insert_tests {
std::pair<overloaded_constructor const, overloaded_constructor> > > std::pair<overloaded_constructor const, overloaded_constructor> > >
x; x;
x.emplace(std::piecewise_construct, boost::make_tuple(), x.emplace(boost::unordered::piecewise_construct, boost::make_tuple(),
boost::make_tuple()); boost::make_tuple());
BOOST_TEST( BOOST_TEST(
x.find(overloaded_constructor()) != x.end() && x.find(overloaded_constructor()) != x.end() &&
@ -1429,7 +1429,7 @@ namespace insert_tests {
std::pair<overloaded_constructor const, overloaded_constructor> > > std::pair<overloaded_constructor const, overloaded_constructor> > >
x; x;
x.emplace(std::piecewise_construct, boost::make_tuple(), x.emplace(boost::unordered::piecewise_construct, boost::make_tuple(),
boost::make_tuple()); boost::make_tuple());
BOOST_TEST( BOOST_TEST(
x.find(overloaded_constructor()) != x.end() && x.find(overloaded_constructor()) != x.end() &&
@ -1461,12 +1461,12 @@ namespace insert_tests {
x; x;
std::pair<overloaded_constructor, overloaded_constructor> check; std::pair<overloaded_constructor, overloaded_constructor> check;
x.emplace(std::piecewise_construct, boost::make_tuple(), x.emplace(boost::unordered::piecewise_construct, boost::make_tuple(),
boost::make_tuple()); boost::make_tuple());
BOOST_TEST(x.find(check) != x.end() && *x.find(check) == check); BOOST_TEST(x.find(check) != x.end() && *x.find(check) == check);
x.clear(); x.clear();
x.emplace(std::piecewise_construct, boost::make_tuple(1), x.emplace(boost::unordered::piecewise_construct, boost::make_tuple(1),
boost::make_tuple(2, 3)); boost::make_tuple(2, 3));
check = check =
std::make_pair(overloaded_constructor(1), overloaded_constructor(2, 3)); std::make_pair(overloaded_constructor(1), overloaded_constructor(2, 3));
@ -1487,6 +1487,17 @@ namespace insert_tests {
static boost::unordered_set<std::pair<overloaded_constructor, static boost::unordered_set<std::pair<overloaded_constructor,
overloaded_constructor> >* test_pair_oc_set; overloaded_constructor> >* test_pair_oc_set;
#define PIECEWISE_TEST_NAME boost_tuple_piecewise_tests
#define PIECEWISE_NAMESPACE boost::unordered
#define TUPLE_NAMESPACE boost
#define EMULATING_PIECEWISE_CONSTRUCTION 1
#include "./insert_tests.cpp"
#define PIECEWISE_TEST_NAME std_tuple_boost_piecewise_tests
#define PIECEWISE_NAMESPACE boost::unordered
#define TUPLE_NAMESPACE std
#define EMULATING_PIECEWISE_CONSTRUCTION 0
#include "./insert_tests.cpp"
#define PIECEWISE_TEST_NAME boost_tuple_std_piecewise_tests #define PIECEWISE_TEST_NAME boost_tuple_std_piecewise_tests
#define PIECEWISE_NAMESPACE std #define PIECEWISE_NAMESPACE std
@ -1521,10 +1532,6 @@ RUN_TESTS_QUIET()
template <class X> template <class X>
static void MAP_PIECEWISE_TEST(X*) static void MAP_PIECEWISE_TEST(X*)
{ {
#if EMULATING_PIECEWISE_CONSTRUCTION
test::detail::disable_construction_tracking _scoped;
#endif
X x; X x;
x.emplace(PIECEWISE_NAMESPACE::piecewise_construct, x.emplace(PIECEWISE_NAMESPACE::piecewise_construct,
@ -1573,10 +1580,6 @@ RUN_TESTS_QUIET()
template <class X> template <class X>
static void SET_PIECEWISE_TEST(X*) static void SET_PIECEWISE_TEST(X*)
{ {
#if EMULATING_PIECEWISE_CONSTRUCTION
test::detail::disable_construction_tracking _scoped;
#endif
X x; X x;
std::pair<overloaded_constructor, overloaded_constructor> check; std::pair<overloaded_constructor, overloaded_constructor> check;
@ -1617,9 +1620,6 @@ RUN_TESTS_QUIET()
#ifndef BOOST_UNORDERED_FOA_TESTS #ifndef BOOST_UNORDERED_FOA_TESTS
UNORDERED_AUTO_TEST (BOOST_PP_CAT(multimap_, PIECEWISE_TEST_NAME)) { UNORDERED_AUTO_TEST (BOOST_PP_CAT(multimap_, PIECEWISE_TEST_NAME)) {
{ {
#if EMULATING_PIECEWISE_CONSTRUCTION
test::detail::disable_construction_tracking _scoped;
#endif
boost::unordered_multimap<overloaded_constructor, overloaded_constructor, boost::unordered_multimap<overloaded_constructor, overloaded_constructor,
boost::hash<overloaded_constructor>, boost::hash<overloaded_constructor>,
std::equal_to<overloaded_constructor>, std::equal_to<overloaded_constructor>,