mirror of
https://github.com/boostorg/functional.git
synced 2025-08-02 22:14:28 +02:00
Avoid some warnings when compiling the test with Visual C++.
[SVN r40004]
This commit is contained in:
@@ -17,6 +17,10 @@
|
|||||||
#include <boost/limits.hpp>
|
#include <boost/limits.hpp>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable:4127) // conditional expression is constant
|
||||||
|
#endif
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
void float_tests(char const* name, T* = 0)
|
void float_tests(char const* name, T* = 0)
|
||||||
@@ -198,3 +202,6 @@ void float_tests(char const* name, T* = 0)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
@@ -8,6 +8,10 @@
|
|||||||
#else
|
#else
|
||||||
|
|
||||||
#include <boost/preprocessor/cat.hpp>
|
#include <boost/preprocessor/cat.hpp>
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable:4245) // signed/unsigned mismatch
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
||||||
{
|
{
|
||||||
@@ -60,5 +64,9 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
#undef CONTAINER_TYPE
|
#undef CONTAINER_TYPE
|
||||||
#endif
|
#endif
|
||||||
|
@@ -21,6 +21,13 @@
|
|||||||
|
|
||||||
#include "./compile_time.hpp"
|
#include "./compile_time.hpp"
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable:4127) // conditional expression is constant
|
||||||
|
#pragma warning(disable:4309) // truncation of constant value
|
||||||
|
#pragma warning(disable:4310) // cast truncates constant value
|
||||||
|
#endif
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
void numeric_test(T*)
|
void numeric_test(T*)
|
||||||
{
|
{
|
||||||
@@ -31,7 +38,7 @@ void numeric_test(T*)
|
|||||||
HASH_NAMESPACE::hash<T> x1;
|
HASH_NAMESPACE::hash<T> x1;
|
||||||
HASH_NAMESPACE::hash<T> x2;
|
HASH_NAMESPACE::hash<T> x2;
|
||||||
|
|
||||||
T v1 = -5;
|
T v1 = (T) -5;
|
||||||
BOOST_TEST(x1(v1) == x2(v1));
|
BOOST_TEST(x1(v1) == x2(v1));
|
||||||
BOOST_TEST(x1(T(-5)) == x2(T(-5)));
|
BOOST_TEST(x1(T(-5)) == x2(T(-5)));
|
||||||
BOOST_TEST(x1(T(0)) == x2(T(0)));
|
BOOST_TEST(x1(T(0)) == x2(T(0)));
|
||||||
@@ -106,6 +113,16 @@ void poor_quality_tests(T*)
|
|||||||
BOOST_TEST(x1((limits::max)()) != x2((limits::max)() - 1));
|
BOOST_TEST(x1((limits::max)()) != x2((limits::max)() - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void bool_test()
|
||||||
|
{
|
||||||
|
HASH_NAMESPACE::hash<bool> x1;
|
||||||
|
HASH_NAMESPACE::hash<bool> x2;
|
||||||
|
|
||||||
|
BOOST_TEST(x1(true) == x2(true));
|
||||||
|
BOOST_TEST(x1(false) == x2(false));
|
||||||
|
BOOST_TEST(x1(true) != x2(false));
|
||||||
|
BOOST_TEST(x1(false) != x2(true));
|
||||||
|
}
|
||||||
|
|
||||||
#define NUMERIC_TEST(type, name) \
|
#define NUMERIC_TEST(type, name) \
|
||||||
std::cerr<<"Testing: " BOOST_STRINGIZE(name) "\n"; \
|
std::cerr<<"Testing: " BOOST_STRINGIZE(name) "\n"; \
|
||||||
@@ -119,7 +136,6 @@ void poor_quality_tests(T*)
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
NUMERIC_TEST(bool, bool)
|
|
||||||
NUMERIC_TEST(char, char)
|
NUMERIC_TEST(char, char)
|
||||||
NUMERIC_TEST(signed char, schar)
|
NUMERIC_TEST(signed char, schar)
|
||||||
NUMERIC_TEST(unsigned char, uchar)
|
NUMERIC_TEST(unsigned char, uchar)
|
||||||
@@ -142,7 +158,11 @@ int main()
|
|||||||
NUMERIC_TEST(double, double)
|
NUMERIC_TEST(double, double)
|
||||||
NUMERIC_TEST(long double, ldouble)
|
NUMERIC_TEST(long double, ldouble)
|
||||||
|
|
||||||
|
bool_test();
|
||||||
|
|
||||||
return boost::report_errors();
|
return boost::report_errors();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
@@ -9,6 +9,11 @@
|
|||||||
|
|
||||||
#include <boost/preprocessor/cat.hpp>
|
#include <boost/preprocessor/cat.hpp>
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable:4245) // signed/unsigned mismatch
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
||||||
{
|
{
|
||||||
template <class T>
|
template <class T>
|
||||||
@@ -63,5 +68,9 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
#undef CONTAINER_TYPE
|
#undef CONTAINER_TYPE
|
||||||
#endif
|
#endif
|
||||||
|
@@ -9,6 +9,11 @@
|
|||||||
|
|
||||||
#include <boost/preprocessor/cat.hpp>
|
#include <boost/preprocessor/cat.hpp>
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable:4245) // signed/unsigned mismatch
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
||||||
{
|
{
|
||||||
template <class T>
|
template <class T>
|
||||||
@@ -61,5 +66,9 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
#undef CONTAINER_TYPE
|
#undef CONTAINER_TYPE
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user