mirror of
https://github.com/boostorg/functional.git
synced 2025-08-01 21:44:28 +02:00
Merge some minor changes from the development branch to remove some unnecessary differences.
[SVN r40131]
This commit is contained in:
@@ -17,6 +17,7 @@
|
|||||||
#include <boost/limits.hpp>
|
#include <boost/limits.hpp>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#if defined(BOOST_MSVC)
|
#if defined(BOOST_MSVC)
|
||||||
#pragma warning(push)
|
#pragma warning(push)
|
||||||
#pragma warning(disable:4127) // conditional expression is constant
|
#pragma warning(disable:4127) // conditional expression is constant
|
||||||
|
@@ -44,7 +44,7 @@ namespace boost
|
|||||||
# ifdef TEST_STD_INCLUDES
|
# ifdef TEST_STD_INCLUDES
|
||||||
# include <functional>
|
# include <functional>
|
||||||
# else
|
# else
|
||||||
# include <boost/functional/hash/hash.hpp>
|
# include <boost/functional/hash.hpp>
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -8,6 +8,7 @@
|
|||||||
#else
|
#else
|
||||||
|
|
||||||
#include <boost/preprocessor/cat.hpp>
|
#include <boost/preprocessor/cat.hpp>
|
||||||
|
|
||||||
#if defined(BOOST_MSVC)
|
#if defined(BOOST_MSVC)
|
||||||
#pragma warning(push)
|
#pragma warning(push)
|
||||||
#pragma warning(disable:4245) // signed/unsigned mismatch
|
#pragma warning(disable:4245) // signed/unsigned mismatch
|
||||||
|
@@ -19,7 +19,7 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
|||||||
template <class T>
|
template <class T>
|
||||||
void integer_tests(T* = 0)
|
void integer_tests(T* = 0)
|
||||||
{
|
{
|
||||||
const int number_of_containers = 11;
|
const int number_of_containers = 12;
|
||||||
T containers[number_of_containers];
|
T containers[number_of_containers];
|
||||||
|
|
||||||
for(int i = 0; i < 5; ++i) {
|
for(int i = 0; i < 5; ++i) {
|
||||||
@@ -35,6 +35,11 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
|||||||
containers[9].insert(-1);
|
containers[9].insert(-1);
|
||||||
containers[10].insert(-1);
|
containers[10].insert(-1);
|
||||||
containers[10].insert(1);
|
containers[10].insert(1);
|
||||||
|
containers[11].insert(1);
|
||||||
|
containers[11].insert(2);
|
||||||
|
containers[11].insert(3);
|
||||||
|
containers[11].insert(4);
|
||||||
|
containers[11].insert(5);
|
||||||
|
|
||||||
HASH_NAMESPACE::hash<T> hasher;
|
HASH_NAMESPACE::hash<T> hasher;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user