From 5632555aa4309f22c0b6597f07b43d7c60e623f5 Mon Sep 17 00:00:00 2001 From: bemandawes Date: Tue, 24 May 2011 13:21:53 +0000 Subject: [PATCH] Remove the endian (operator <= and >=) stream operations as just too kinky and likely to cause confusion and misuse. Adjust uses accordingly. Clear more VC++ warnings. git-svn-id: http://svn.boost.org/svn/boost/sandbox/endian@72131 b8fc166d-592f-0410-95f2-cb63ce0dd405 --- boost/endian/endian_binary_stream.hpp | 135 -------- libs/endian/example/endian_hello_world.cpp | 15 +- libs/endian/test/Jamfile.v2 | 3 +- .../endian-in-sandbox/endian-in-sandbox.sln | 8 +- .../endian_binary_stream_test.vcxproj | 93 ------ .../endian/test/endian_binary_stream_test.cpp | 289 ------------------ libs/endian/test/endian_operations_test.cpp | 14 +- 7 files changed, 24 insertions(+), 533 deletions(-) delete mode 100644 boost/endian/endian_binary_stream.hpp delete mode 100644 libs/endian/test/endian-in-sandbox/endian_binary_stream_test/endian_binary_stream_test.vcxproj delete mode 100644 libs/endian/test/endian_binary_stream_test.cpp diff --git a/boost/endian/endian_binary_stream.hpp b/boost/endian/endian_binary_stream.hpp deleted file mode 100644 index bf14385..0000000 --- a/boost/endian/endian_binary_stream.hpp +++ /dev/null @@ -1,135 +0,0 @@ -// boost/integer/endian_binary_stream.hpp --------------------------------------------// - -// Copyright Beman Dawes 2009 - -// Distributed under the Boost Software License, Version 1.0. -// See http://www.boost.org/LICENSE_1_0.txt - -// See library home page at http://www.boost.org/libs/endian - -#ifndef BOOST_ENDIAN_BINARY_STREAM_HPP -#define BOOST_ENDIAN_BINARY_STREAM_HPP - -#include -#include -#include -#include - -// unformatted binary (as opposed to formatted character) stream insertion -// and extraction. - -// Warning: Use only on streams opened with filemode std::ios_base::binary. Thus -// unformatted binary I/O should not be with the standard streams (cout, cin, etc.) -// since they are opened in text mode. Use on text streams may produce incorrect -// results, such as insertion of unwanted characters or premature end-of-file. -// For example, on Windows 0x0D would become 0x0D, 0x0A. - -// Caution: When mixing formatted (i.e. operator << or >>) and unformatted (i.e. -// operator <= or >=) be aware that << and >> take precedence over <= and >=. Use -// parentheses to force correct order of evaluation. For example: -// -// my_stream << foo <= bar; // no parentheses needed -// (my_stream <= foo) << bar; // parentheses required - -// This implementation uses reinterpret_cast<>() when needed to convert one pointer -// type to another. See 5.2.10 [expr.reinterpret.cast], Reinterpret cast, para 7. - -namespace boost -{ - namespace endian - { - template< class T > struct is_endian { static const bool value = false; }; - - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - - # if defined(BOOST_HAS_INT16_T) - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; -# endif - -# if defined(BOOST_HAS_INT32_T) - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; -# endif - -# if defined(BOOST_HAS_INT64_T) - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; - template<> struct is_endian { static const bool value = true; }; -# endif - - template < class Endian > - inline typename boost::enable_if< is_endian, std::ostream & >::type - operator<=( std::ostream & os, const Endian & e ) - { - return os.write( e.data(), sizeof(e) ); - } - - template < class Endian > - inline typename boost::enable_if< is_endian, std::istream & >::type - operator>=( std::istream & is, Endian & e ) - { - return is.read( reinterpret_cast(&e), sizeof(e) ); - } - - } // namespace integer -} // namespace boost - -#endif // BOOST_ENDIAN_BINARY_STREAM_HPP diff --git a/libs/endian/example/endian_hello_world.cpp b/libs/endian/example/endian_hello_world.cpp index ff1b408..9482071 100644 --- a/libs/endian/example/endian_hello_world.cpp +++ b/libs/endian/example/endian_hello_world.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include @@ -24,9 +23,17 @@ int main() big32_t b(v); little32_t l(v); - std::cout << "Hello, endian world!\n\n"; + std::cout << std::hex << "Hello, endian world!\n\n"; - std::cout << v << ' ' << b << ' ' << l << '\n'; - std::cout <= v <= ' ' <= b <= ' ' <= l <= '\n'; + std::cout << "hex stream output: int_least32_t=" << v + << ", big32_t=" << b << ", little32_t=" << l << '\n'; + std::cout << "bin stream output: int_least32_t=" << bin(v) + << ", big32_t=" << bin(b) << ", little32_t=" << bin(l) << '\n'; } +// Output on a little endian machine: +// +// Hello, endian world! +// +// hex stream output: int_least32_t=31323334, big32_t=31323334, little32_t=31323334 +// bin stream output: int_least32_t=4321, big32_t=1234, little32_t=4321 diff --git a/libs/endian/test/Jamfile.v2 b/libs/endian/test/Jamfile.v2 index 403f040..601561d 100644 --- a/libs/endian/test/Jamfile.v2 +++ b/libs/endian/test/Jamfile.v2 @@ -11,8 +11,7 @@ test-suite "endian" : -# [ run binary_stream_test.cpp ] -# [ run endian_binary_stream_test.cpp ] + [ run binary_stream_test.cpp ] [ run endian_test.cpp ] [ run endian_operations_test.cpp : : : gcc:-Wno-sign-compare ] diff --git a/libs/endian/test/endian-in-sandbox/endian-in-sandbox.sln b/libs/endian/test/endian-in-sandbox/endian-in-sandbox.sln index d753e0e..a24c774 100644 --- a/libs/endian/test/endian-in-sandbox/endian-in-sandbox.sln +++ b/libs/endian/test/endian-in-sandbox/endian-in-sandbox.sln @@ -15,8 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "endian_hello_world", "endia EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binary_stream_test", "binary_stream_test\binary_stream_test.vcxproj", "{1382D085-FF3F-4573-8709-E10D3D74D620}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "endian_binary_stream_test", "endian_binary_stream_test\endian_binary_stream_test.vcxproj", "{AD46E04C-C1E1-446E-8D5F-E11B6C438181}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "binary_stream_example", "binary_stream_example\binary_stream_example.vcxproj", "{06736C67-6305-4A9F-8D10-850FD0CE907D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "conversion_test", "conversion_test\conversion_test.vcxproj", "{9FA33B0B-2B00-49E8-A892-E049D86076A9}" @@ -52,11 +50,13 @@ Global {1AAEBB4E-501E-417E-9531-04469AF5DD8B}.Release|Win32.ActiveCfg = Release|Win32 {1AAEBB4E-501E-417E-9531-04469AF5DD8B}.Release|Win32.Build.0 = Release|Win32 {1382D085-FF3F-4573-8709-E10D3D74D620}.Debug|Win32.ActiveCfg = Debug|Win32 + {1382D085-FF3F-4573-8709-E10D3D74D620}.Debug|Win32.Build.0 = Debug|Win32 {1382D085-FF3F-4573-8709-E10D3D74D620}.Release|Win32.ActiveCfg = Release|Win32 - {AD46E04C-C1E1-446E-8D5F-E11B6C438181}.Debug|Win32.ActiveCfg = Debug|Win32 - {AD46E04C-C1E1-446E-8D5F-E11B6C438181}.Release|Win32.ActiveCfg = Release|Win32 + {1382D085-FF3F-4573-8709-E10D3D74D620}.Release|Win32.Build.0 = Release|Win32 {06736C67-6305-4A9F-8D10-850FD0CE907D}.Debug|Win32.ActiveCfg = Debug|Win32 + {06736C67-6305-4A9F-8D10-850FD0CE907D}.Debug|Win32.Build.0 = Debug|Win32 {06736C67-6305-4A9F-8D10-850FD0CE907D}.Release|Win32.ActiveCfg = Release|Win32 + {06736C67-6305-4A9F-8D10-850FD0CE907D}.Release|Win32.Build.0 = Release|Win32 {9FA33B0B-2B00-49E8-A892-E049D86076A9}.Debug|Win32.ActiveCfg = Debug|Win32 {9FA33B0B-2B00-49E8-A892-E049D86076A9}.Debug|Win32.Build.0 = Debug|Win32 {9FA33B0B-2B00-49E8-A892-E049D86076A9}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/libs/endian/test/endian-in-sandbox/endian_binary_stream_test/endian_binary_stream_test.vcxproj b/libs/endian/test/endian-in-sandbox/endian_binary_stream_test/endian_binary_stream_test.vcxproj deleted file mode 100644 index 1661b9e..0000000 --- a/libs/endian/test/endian-in-sandbox/endian_binary_stream_test/endian_binary_stream_test.vcxproj +++ /dev/null @@ -1,93 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {AD46E04C-C1E1-446E-8D5F-E11B6C438181} - endian_binary_stream_test - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - MaxSpeed - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - - - - - \ No newline at end of file diff --git a/libs/endian/test/endian_binary_stream_test.cpp b/libs/endian/test/endian_binary_stream_test.cpp deleted file mode 100644 index 3b4df22..0000000 --- a/libs/endian/test/endian_binary_stream_test.cpp +++ /dev/null @@ -1,289 +0,0 @@ -// endian_binary_stream_test.cpp -----------------------------------------------------// - -// Copyright Beman Dawes 2009 - -// Distributed under the Boost Software License, Version 1.0. -// See http://www.boost.org/LICENSE_1_0.txt - -#include -#include -#include - -using namespace boost; -using namespace boost::integer; -using namespace std; - -namespace -{ - int errors = 0; - - void verify( bool x, const char * file, int line ) - { - if ( x ) return; - ++errors; - cout << file << "(" << line << ") : error: predicate is false\n" << endl; - } - -} - -#define BOOST_VERIFY(predicate) verify( predicate, __FILE__, __LINE__ ) - -int main() -{ - std::stringstream ss( std::ios_base::in | std::ios_base::out | std::ios_base::binary ); - - // big tests - - big8_t big8_t_1(0x01), big8_t_2; - ss <= big8_t_1; - ss >= big8_t_2; - BOOST_VERIFY( big8_t_1 == big8_t_2 ); - - big16_t big16_t_1(0x0102), big16_t_2; - ss <= big16_t_1; - ss >= big16_t_2; - BOOST_VERIFY( big16_t_1 == big16_t_2 ); - - big24_t big24_t_1(0x010203L), big24_t_2; - ss <= big24_t_1; - ss >= big24_t_2; - BOOST_VERIFY( big24_t_1 == big24_t_2 ); - - big32_t big32_t_1(0x01020304L), big32_t_2; - ss <= big32_t_1; - ss >= big32_t_2; - BOOST_VERIFY( big32_t_1 == big32_t_2 ); - - big40_t big40_t_1(0x0102030405LL), big40_t_2; - ss <= big40_t_1; - ss >= big40_t_2; - BOOST_VERIFY( big40_t_1 == big40_t_2 ); - - big48_t big48_t_1(0x010203040506LL), big48_t_2; - ss <= big48_t_1; - ss >= big48_t_2; - BOOST_VERIFY( big48_t_1 == big48_t_2 ); - - big56_t big56_t_1(0x01020304050607LL), big56_t_2; - ss <= big56_t_1; - ss >= big56_t_2; - BOOST_VERIFY( big56_t_1 == big56_t_2 ); - - big64_t big64_t_1(0x0102030405060808LL), big64_t_2; - ss <= big64_t_1; - ss >= big64_t_2; - BOOST_VERIFY( big64_t_1 == big64_t_2 ); - - // ubig tests - - ubig8_t ubig8_t_1(0x01), ubig8_t_2; - ss <= ubig8_t_1; - ss >= ubig8_t_2; - BOOST_VERIFY( ubig8_t_1 == ubig8_t_2 ); - - ubig16_t ubig16_t_1(0x0102), ubig16_t_2; - ss <= ubig16_t_1; - ss >= ubig16_t_2; - BOOST_VERIFY( ubig16_t_1 == ubig16_t_2 ); - - ubig24_t ubig24_t_1(0x010203L), ubig24_t_2; - ss <= ubig24_t_1; - ss >= ubig24_t_2; - BOOST_VERIFY( ubig24_t_1 == ubig24_t_2 ); - - ubig32_t ubig32_t_1(0x01020304L), ubig32_t_2; - ss <= ubig32_t_1; - ss >= ubig32_t_2; - BOOST_VERIFY( ubig32_t_1 == ubig32_t_2 ); - - ubig40_t ubig40_t_1(0x0102030405LL), ubig40_t_2; - ss <= ubig40_t_1; - ss >= ubig40_t_2; - BOOST_VERIFY( ubig40_t_1 == ubig40_t_2 ); - - ubig48_t ubig48_t_1(0x010203040506LL), ubig48_t_2; - ss <= ubig48_t_1; - ss >= ubig48_t_2; - BOOST_VERIFY( ubig48_t_1 == ubig48_t_2 ); - - ubig56_t ubig56_t_1(0x01020304050607LL), ubig56_t_2; - ss <= ubig56_t_1; - ss >= ubig56_t_2; - BOOST_VERIFY( ubig56_t_1 == ubig56_t_2 ); - - ubig64_t ubig64_t_1(0x0102030405060808LL), ubig64_t_2; - ss <= ubig64_t_1; - ss >= ubig64_t_2; - BOOST_VERIFY( ubig64_t_1 == ubig64_t_2 ); - - // little tests - - little8_t little8_t_1(0x01), little8_t_2; - ss <= little8_t_1; - ss >= little8_t_2; - BOOST_VERIFY( little8_t_1 == little8_t_2 ); - - little16_t little16_t_1(0x0102), little16_t_2; - ss <= little16_t_1; - ss >= little16_t_2; - BOOST_VERIFY( little16_t_1 == little16_t_2 ); - - little24_t little24_t_1(0x010203L), little24_t_2; - ss <= little24_t_1; - ss >= little24_t_2; - BOOST_VERIFY( little24_t_1 == little24_t_2 ); - - little32_t little32_t_1(0x01020304L), little32_t_2; - ss <= little32_t_1; - ss >= little32_t_2; - BOOST_VERIFY( little32_t_1 == little32_t_2 ); - - little40_t little40_t_1(0x0102030405LL), little40_t_2; - ss <= little40_t_1; - ss >= little40_t_2; - BOOST_VERIFY( little40_t_1 == little40_t_2 ); - - little48_t little48_t_1(0x010203040506LL), little48_t_2; - ss <= little48_t_1; - ss >= little48_t_2; - BOOST_VERIFY( little48_t_1 == little48_t_2 ); - - little56_t little56_t_1(0x01020304050607LL), little56_t_2; - ss <= little56_t_1; - ss >= little56_t_2; - BOOST_VERIFY( little56_t_1 == little56_t_2 ); - - little64_t little64_t_1(0x0102030405060808LL), little64_t_2; - ss <= little64_t_1; - ss >= little64_t_2; - BOOST_VERIFY( little64_t_1 == little64_t_2 ); - - // ulittle tests - - ulittle8_t ulittle8_t_1(0x01), ulittle8_t_2; - ss <= ulittle8_t_1; - ss >= ulittle8_t_2; - BOOST_VERIFY( ulittle8_t_1 == ulittle8_t_2 ); - - ulittle16_t ulittle16_t_1(0x0102), ulittle16_t_2; - ss <= ulittle16_t_1; - ss >= ulittle16_t_2; - BOOST_VERIFY( ulittle16_t_1 == ulittle16_t_2 ); - - ulittle24_t ulittle24_t_1(0x010203L), ulittle24_t_2; - ss <= ulittle24_t_1; - ss >= ulittle24_t_2; - BOOST_VERIFY( ulittle24_t_1 == ulittle24_t_2 ); - - ulittle32_t ulittle32_t_1(0x01020304L), ulittle32_t_2; - ss <= ulittle32_t_1; - ss >= ulittle32_t_2; - BOOST_VERIFY( ulittle32_t_1 == ulittle32_t_2 ); - - ulittle40_t ulittle40_t_1(0x0102030405LL), ulittle40_t_2; - ss <= ulittle40_t_1; - ss >= ulittle40_t_2; - BOOST_VERIFY( ulittle40_t_1 == ulittle40_t_2 ); - - ulittle48_t ulittle48_t_1(0x010203040506LL), ulittle48_t_2; - ss <= ulittle48_t_1; - ss >= ulittle48_t_2; - BOOST_VERIFY( ulittle48_t_1 == ulittle48_t_2 ); - - ulittle56_t ulittle56_t_1(0x01020304050607LL), ulittle56_t_2; - ss <= ulittle56_t_1; - ss >= ulittle56_t_2; - BOOST_VERIFY( ulittle56_t_1 == ulittle56_t_2 ); - - ulittle64_t ulittle64_t_1(0x0102030405060808LL), ulittle64_t_2; - ss <= ulittle64_t_1; - ss >= ulittle64_t_2; - BOOST_VERIFY( ulittle64_t_1 == ulittle64_t_2 ); - - // native tests - - native8_t native8_t_1(0x01), native8_t_2; - ss <= native8_t_1; - ss >= native8_t_2; - BOOST_VERIFY( native8_t_1 == native8_t_2 ); - - native16_t native16_t_1(0x0102), native16_t_2; - ss <= native16_t_1; - ss >= native16_t_2; - BOOST_VERIFY( native16_t_1 == native16_t_2 ); - - native24_t native24_t_1(0x010203L), native24_t_2; - ss <= native24_t_1; - ss >= native24_t_2; - BOOST_VERIFY( native24_t_1 == native24_t_2 ); - - native32_t native32_t_1(0x01020304L), native32_t_2; - ss <= native32_t_1; - ss >= native32_t_2; - BOOST_VERIFY( native32_t_1 == native32_t_2 ); - - native40_t native40_t_1(0x0102030405LL), native40_t_2; - ss <= native40_t_1; - ss >= native40_t_2; - BOOST_VERIFY( native40_t_1 == native40_t_2 ); - - native48_t native48_t_1(0x010203040506LL), native48_t_2; - ss <= native48_t_1; - ss >= native48_t_2; - BOOST_VERIFY( native48_t_1 == native48_t_2 ); - - native56_t native56_t_1(0x01020304050607LL), native56_t_2; - ss <= native56_t_1; - ss >= native56_t_2; - BOOST_VERIFY( native56_t_1 == native56_t_2 ); - - native64_t native64_t_1(0x0102030405060808LL), native64_t_2; - ss <= native64_t_1; - ss >= native64_t_2; - BOOST_VERIFY( native64_t_1 == native64_t_2 ); - - // unative tests - - unative8_t unative8_t_1(0x01), unative8_t_2; - ss <= unative8_t_1; - ss >= unative8_t_2; - BOOST_VERIFY( unative8_t_1 == unative8_t_2 ); - - unative16_t unative16_t_1(0x0102), unative16_t_2; - ss <= unative16_t_1; - ss >= unative16_t_2; - BOOST_VERIFY( unative16_t_1 == unative16_t_2 ); - - unative24_t unative24_t_1(0x010203L), unative24_t_2; - ss <= unative24_t_1; - ss >= unative24_t_2; - BOOST_VERIFY( unative24_t_1 == unative24_t_2 ); - - unative32_t unative32_t_1(0x01020304L), unative32_t_2; - ss <= unative32_t_1; - ss >= unative32_t_2; - BOOST_VERIFY( unative32_t_1 == unative32_t_2 ); - - unative40_t unative40_t_1(0x0102030405LL), unative40_t_2; - ss <= unative40_t_1; - ss >= unative40_t_2; - BOOST_VERIFY( unative40_t_1 == unative40_t_2 ); - - unative48_t unative48_t_1(0x010203040506LL), unative48_t_2; - ss <= unative48_t_1; - ss >= unative48_t_2; - BOOST_VERIFY( unative48_t_1 == unative48_t_2 ); - - unative56_t unative56_t_1(0x01020304050607LL), unative56_t_2; - ss <= unative56_t_1; - ss >= unative56_t_2; - BOOST_VERIFY( unative56_t_1 == unative56_t_2 ); - - unative64_t unative64_t_1(0x0102030405060808LL), unative64_t_2; - ss <= unative64_t_1; - ss >= unative64_t_2; - BOOST_VERIFY( unative64_t_1 == unative64_t_2 ); - - cout << errors << " error(s) detected\n"; - return errors; -} diff --git a/libs/endian/test/endian_operations_test.cpp b/libs/endian/test/endian_operations_test.cpp index 176a45c..25914c9 100644 --- a/libs/endian/test/endian_operations_test.cpp +++ b/libs/endian/test/endian_operations_test.cpp @@ -17,10 +17,17 @@ //----------------------------------------------------------------------------// #define BOOST_ENDIAN_LOG -#define BOOST_SHORT_ENDIAN_TEST 1 #include +#ifdef _MSC_VER +# pragma warning( disable : 4242 ) // conversion ..., possible loss of data +# pragma warning( disable : 4244 ) // conversion ..., possible loss of data +# pragma warning( disable : 4018 ) // signed/unsigned mismatch +# pragma warning( disable : 4365 ) // signed/unsigned mismatch +# pragma warning( disable : 4389 ) // signed/unsigned mismatch +#endif + #include #include #include @@ -28,11 +35,6 @@ namespace be = boost::endian; -#ifdef _MSC_VER -# pragma warning( disable : 4244 ) // conversion ..., possible loss of data -# pragma warning( disable : 4018 ) // signed/unsigned mismatch -#endif - template struct default_construct {