Do not define _SCL_SECURE_NO_WARNINGS or _CRT_SECURE_NO_WARNINGS if already defined (such as on the command line), plus related cleanups.

This commit is contained in:
Beman
2014-12-10 10:26:49 -05:00
parent 66a7a0bfac
commit dcde9463fc
13 changed files with 37 additions and 27 deletions

View File

@@ -9,9 +9,6 @@
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
#define _CRT_SECURE_NO_DEPRECATE // quiet VC++ 8.0 foolishness
#define _SCL_SECURE_NO_WARNINGS
#include <boost/endian/detail/disable_warnings.hpp> #include <boost/endian/detail/disable_warnings.hpp>
#include <iostream> #include <iostream>

View File

@@ -7,8 +7,6 @@
//--------------------------------------------------------------------------------------// //--------------------------------------------------------------------------------------//
#define _CRT_SECURE_NO_WARNINGS
#include <boost/endian/detail/disable_warnings.hpp> #include <boost/endian/detail/disable_warnings.hpp>
#include <boost/endian/conversion.hpp> #include <boost/endian/conversion.hpp>

View File

@@ -7,7 +7,14 @@
//--------------------------------------------------------------------------------------// //--------------------------------------------------------------------------------------//
#define _SCL_SECURE_NO_WARNINGS #ifndef _SCL_SECURE_NO_WARNINGS
# define _SCL_SECURE_NO_WARNINGS
#endif
#ifndef _CRT_SECURE_NO_WARNINGS
# define _CRT_SECURE_NO_WARNINGS
#endif
#include <boost/endian/conversion.hpp> #include <boost/endian/conversion.hpp>
#include <boost/endian/buffers.hpp> #include <boost/endian/buffers.hpp>

View File

@@ -8,6 +8,15 @@
//--------------------------------------------------------------------------------------// //--------------------------------------------------------------------------------------//
#ifdef _MSC_VER #ifdef _MSC_VER
#ifndef _SCL_SECURE_NO_WARNINGS
# define _SCL_SECURE_NO_WARNINGS
#endif
#ifndef _CRT_SECURE_NO_WARNINGS
# define _CRT_SECURE_NO_WARNINGS
#endif
# pragma warning(push) # pragma warning(push)
// triggered by boost/detail/lightweight_test.hpp // triggered by boost/detail/lightweight_test.hpp

View File

@@ -5,8 +5,13 @@
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt // http://www.boost.org/LICENSE_1_0.txt
#define _CRT_SECURE_NO_WARNINGS #ifndef _SCL_SECURE_NO_WARNINGS
#define _SCL_SECURE_NO_WARNINGS # define _SCL_SECURE_NO_WARNINGS
#endif
#ifndef _CRT_SECURE_NO_WARNINGS
# define _CRT_SECURE_NO_WARNINGS
#endif
#include <cstdlib> #include <cstdlib>
#include <boost/endian/conversion.hpp> #include <boost/endian/conversion.hpp>

View File

@@ -9,8 +9,6 @@
//--------------------------------------------------------------------------------------// //--------------------------------------------------------------------------------------//
#define _SCL_SECURE_NO_WARNINGS
#include <boost/endian/detail/disable_warnings.hpp> #include <boost/endian/detail/disable_warnings.hpp>
#define BOOST_ENDIAN_LOG #define BOOST_ENDIAN_LOG

View File

@@ -9,8 +9,6 @@
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
#define _SCL_SECURE_NO_WARNINGS
#define BOOST_ENDIAN_FORCE_PODNESS #define BOOST_ENDIAN_FORCE_PODNESS
#include <boost/endian/detail/disable_warnings.hpp> #include <boost/endian/detail/disable_warnings.hpp>

View File

@@ -28,8 +28,6 @@
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
#define _SCL_SECURE_NO_WARNINGS
#define BOOST_ENDIAN_LOG #define BOOST_ENDIAN_LOG
#include <boost/endian/detail/disable_warnings.hpp> #include <boost/endian/detail/disable_warnings.hpp>

View File

@@ -16,8 +16,6 @@
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
#define _SCL_SECURE_NO_WARNINGS
#include <boost/endian/detail/disable_warnings.hpp> #include <boost/endian/detail/disable_warnings.hpp>
#include <boost/endian/arithmetic.hpp> #include <boost/endian/arithmetic.hpp>

View File

@@ -7,8 +7,6 @@
//--------------------------------------------------------------------------------------// //--------------------------------------------------------------------------------------//
#define _SCL_SECURE_NO_WARNINGS
//#define BOOST_ENDIAN_NO_INTRINSICS //#define BOOST_ENDIAN_NO_INTRINSICS
//#define BOOST_ENDIAN_LOG //#define BOOST_ENDIAN_LOG

View File

@@ -7,8 +7,6 @@
//--------------------------------------------------------------------------------------// //--------------------------------------------------------------------------------------//
#define _SCL_SECURE_NO_WARNINGS
#define BOOST_ENDIAN_NO_INTRINSICS #define BOOST_ENDIAN_NO_INTRINSICS
//#define BOOST_ENDIAN_LOG //#define BOOST_ENDIAN_LOG

View File

@@ -13,7 +13,13 @@
//--------------------------------------------------------------------------------------// //--------------------------------------------------------------------------------------//
#define _SCL_SECURE_NO_WARNINGS #ifndef _SCL_SECURE_NO_WARNINGS
# define _SCL_SECURE_NO_WARNINGS
#endif
#ifndef _CRT_SECURE_NO_WARNINGS
# define _CRT_SECURE_NO_WARNINGS
#endif
#include "speed_test_functions.hpp" #include "speed_test_functions.hpp"

View File

@@ -28,8 +28,8 @@ namespace user
int16_t return_x_little_int16(int16_t x, little_int16_ut y) BOOST_NOEXCEPT; int16_t return_x_little_int16(int16_t x, little_int16_ut y) BOOST_NOEXCEPT;
int16_t return_x_value_big_int16(int16_t x, big_int16_ut) BOOST_NOEXCEPT; int16_t return_x_value_big_int16(int16_t x, big_int16_ut) BOOST_NOEXCEPT;
int16_t return_x_value_little_int16(int16_t x, little_int16_ut y) BOOST_NOEXCEPT; int16_t return_x_value_little_int16(int16_t x, little_int16_ut y) BOOST_NOEXCEPT;
int16_t return_x_in_place_big_int16(int16_t x, big_int16_ut y) BOOST_NOEXCEPT; int16_t return_x_inplace_big_int16(int16_t x, big_int16_ut y) BOOST_NOEXCEPT;
int16_t return_x_in_place_little_int16(int16_t x, little_int16_ut y) BOOST_NOEXCEPT; int16_t return_x_inplace_little_int16(int16_t x, little_int16_ut y) BOOST_NOEXCEPT;
int16_t return_y_big_int16(int16_t x, big_int16_ut y) BOOST_NOEXCEPT; int16_t return_y_big_int16(int16_t x, big_int16_ut y) BOOST_NOEXCEPT;
int16_t return_y_little_int16(int16_t x, little_int16_ut y) BOOST_NOEXCEPT; int16_t return_y_little_int16(int16_t x, little_int16_ut y) BOOST_NOEXCEPT;
@@ -37,8 +37,8 @@ namespace user
int32_t return_x_little_int32(int32_t x, little_int32_ut y) BOOST_NOEXCEPT; int32_t return_x_little_int32(int32_t x, little_int32_ut y) BOOST_NOEXCEPT;
int32_t return_x_value_big_int32(int32_t x, big_int32_ut) BOOST_NOEXCEPT; int32_t return_x_value_big_int32(int32_t x, big_int32_ut) BOOST_NOEXCEPT;
int32_t return_x_value_little_int32(int32_t x, little_int32_ut y) BOOST_NOEXCEPT; int32_t return_x_value_little_int32(int32_t x, little_int32_ut y) BOOST_NOEXCEPT;
int32_t return_x_in_place_big_int32(int32_t x, big_int32_ut y) BOOST_NOEXCEPT; int32_t return_x_inplace_big_int32(int32_t x, big_int32_ut y) BOOST_NOEXCEPT;
int32_t return_x_in_place_little_int32(int32_t x, little_int32_ut y) BOOST_NOEXCEPT; int32_t return_x_inplace_little_int32(int32_t x, little_int32_ut y) BOOST_NOEXCEPT;
int32_t return_y_big_int32(int32_t x, big_int32_ut y) BOOST_NOEXCEPT; int32_t return_y_big_int32(int32_t x, big_int32_ut y) BOOST_NOEXCEPT;
int32_t return_y_little_int32(int32_t x, little_int32_ut y) BOOST_NOEXCEPT; int32_t return_y_little_int32(int32_t x, little_int32_ut y) BOOST_NOEXCEPT;
@@ -46,8 +46,8 @@ namespace user
int64_t return_x_little_int64(int64_t x, little_int64_ut y) BOOST_NOEXCEPT; int64_t return_x_little_int64(int64_t x, little_int64_ut y) BOOST_NOEXCEPT;
int64_t return_x_value_big_int64(int64_t x, big_int64_ut) BOOST_NOEXCEPT; int64_t return_x_value_big_int64(int64_t x, big_int64_ut) BOOST_NOEXCEPT;
int64_t return_x_value_little_int64(int64_t x, little_int64_ut y) BOOST_NOEXCEPT; int64_t return_x_value_little_int64(int64_t x, little_int64_ut y) BOOST_NOEXCEPT;
int64_t return_x_in_place_big_int64(int64_t x, big_int64_ut y) BOOST_NOEXCEPT; int64_t return_x_inplace_big_int64(int64_t x, big_int64_ut y) BOOST_NOEXCEPT;
int64_t return_x_in_place_little_int64(int64_t x, little_int64_ut y) BOOST_NOEXCEPT; int64_t return_x_inplace_little_int64(int64_t x, little_int64_ut y) BOOST_NOEXCEPT;
int64_t return_y_big_int64(int64_t x, big_int64_ut y) BOOST_NOEXCEPT; int64_t return_y_big_int64(int64_t x, big_int64_ut y) BOOST_NOEXCEPT;
int64_t return_y_little_int64(int64_t x, little_int64_ut y) BOOST_NOEXCEPT; int64_t return_y_little_int64(int64_t x, little_int64_ut y) BOOST_NOEXCEPT;