forked from boostorg/unordered
Final cleanup of BOOST_NO_CXX11_*
This commit is contained in:
@ -9,11 +9,7 @@
|
|||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#if !defined(BOOST_NO_CXX11_REF_QUALIFIERS)
|
|
||||||
#define UNORDERED_LVALUE_QUAL &
|
#define UNORDERED_LVALUE_QUAL &
|
||||||
#else
|
|
||||||
#define UNORDERED_LVALUE_QUAL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace test {
|
namespace test {
|
||||||
struct is_even
|
struct is_even
|
||||||
|
@ -27,13 +27,7 @@
|
|||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
#if defined(BOOST_NO_CXX11_HDR_RANDOM) || BOOST_WORKAROUND(BOOST_MSVC, < 1700)
|
|
||||||
#define BOOST_UNORDERED_TEST_USE_STD_RANDOM_SHUFFLE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef BOOST_UNORDERED_TEST_USE_STD_RANDOM_SHUFFLE
|
|
||||||
#include <random>
|
#include <random>
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
|
@ -539,15 +539,11 @@ namespace unnecessary_copy_tests {
|
|||||||
COPY_COUNT(tuple_copy_cost);
|
COPY_COUNT(tuple_copy_cost);
|
||||||
MOVE_COUNT(tuple_move_cost);
|
MOVE_COUNT(tuple_move_cost);
|
||||||
|
|
||||||
#if !defined(BOOST_NO_CXX11_HDR_TUPLE) && \
|
|
||||||
!(defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 6) && \
|
|
||||||
!(defined(BOOST_MSVC) && BOOST_MSVC < 1700)
|
|
||||||
reset();
|
reset();
|
||||||
x.emplace(std::piecewise_construct,
|
x.emplace(std::piecewise_construct,
|
||||||
std::forward_as_tuple(b.first), std::forward_as_tuple(b.second));
|
std::forward_as_tuple(b.first), std::forward_as_tuple(b.second));
|
||||||
COPY_COUNT(0);
|
COPY_COUNT(0);
|
||||||
MOVE_COUNT(0);
|
MOVE_COUNT(0);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user