From 93d69af60aa6e5027cd42b4b82361fc6edcfb901 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 28 Nov 2003 15:35:21 +0000 Subject: [PATCH] _MSC_VER use clarified. [SVN r20992] --- include/boost/detail/atomic_count.hpp | 2 ++ include/boost/detail/atomic_count_win32.hpp | 2 ++ include/boost/detail/lightweight_mutex.hpp | 2 ++ include/boost/detail/lwm_nop.hpp | 2 ++ include/boost/detail/lwm_pthreads.hpp | 2 ++ include/boost/detail/lwm_win32.hpp | 2 ++ include/boost/detail/lwm_win32_cs.hpp | 2 ++ include/boost/detail/shared_count.hpp | 2 ++ test/intrusive_ptr_test.cpp | 10 +++++++++- test/shared_from_this_test.cpp | 4 +++- test/shared_ptr_assign_fail.cpp | 4 +++- test/shared_ptr_basic_test.cpp | 16 ++++++++++++++++ test/shared_ptr_mt_test.cpp | 4 +++- test/shared_ptr_test.cpp | 10 +++++++++- test/shared_ptr_timing_test.cpp | 4 +++- test/smart_ptr_test.cpp | 10 +++++++++- test/weak_ptr_test.cpp | 10 +++++++++- 17 files changed, 80 insertions(+), 8 deletions(-) diff --git a/include/boost/detail/atomic_count.hpp b/include/boost/detail/atomic_count.hpp index decb95d..da4fc69 100644 --- a/include/boost/detail/atomic_count.hpp +++ b/include/boost/detail/atomic_count.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_DETAIL_ATOMIC_COUNT_HPP_INCLUDED #define BOOST_DETAIL_ATOMIC_COUNT_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/include/boost/detail/atomic_count_win32.hpp b/include/boost/detail/atomic_count_win32.hpp index 8f9ad7f..c8a4681 100644 --- a/include/boost/detail/atomic_count_win32.hpp +++ b/include/boost/detail/atomic_count_win32.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_DETAIL_ATOMIC_COUNT_WIN32_HPP_INCLUDED #define BOOST_DETAIL_ATOMIC_COUNT_WIN32_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/include/boost/detail/lightweight_mutex.hpp b/include/boost/detail/lightweight_mutex.hpp index 961227e..9155940 100644 --- a/include/boost/detail/lightweight_mutex.hpp +++ b/include/boost/detail/lightweight_mutex.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_DETAIL_LIGHTWEIGHT_MUTEX_HPP_INCLUDED #define BOOST_DETAIL_LIGHTWEIGHT_MUTEX_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/include/boost/detail/lwm_nop.hpp b/include/boost/detail/lwm_nop.hpp index d07ff1d..fdc0a3d 100644 --- a/include/boost/detail/lwm_nop.hpp +++ b/include/boost/detail/lwm_nop.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_DETAIL_LWM_NOP_HPP_INCLUDED #define BOOST_DETAIL_LWM_NOP_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/include/boost/detail/lwm_pthreads.hpp b/include/boost/detail/lwm_pthreads.hpp index 1f5f2c9..79ea5a7 100644 --- a/include/boost/detail/lwm_pthreads.hpp +++ b/include/boost/detail/lwm_pthreads.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_DETAIL_LWM_PTHREADS_HPP_INCLUDED #define BOOST_DETAIL_LWM_PTHREADS_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/include/boost/detail/lwm_win32.hpp b/include/boost/detail/lwm_win32.hpp index d60c8b6..2228231 100644 --- a/include/boost/detail/lwm_win32.hpp +++ b/include/boost/detail/lwm_win32.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_DETAIL_LWM_WIN32_HPP_INCLUDED #define BOOST_DETAIL_LWM_WIN32_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/include/boost/detail/lwm_win32_cs.hpp b/include/boost/detail/lwm_win32_cs.hpp index 0a03588..c4547de 100644 --- a/include/boost/detail/lwm_win32_cs.hpp +++ b/include/boost/detail/lwm_win32_cs.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_DETAIL_LWM_WIN32_CS_HPP_INCLUDED #define BOOST_DETAIL_LWM_WIN32_CS_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/include/boost/detail/shared_count.hpp b/include/boost/detail/shared_count.hpp index b4e2db2..2d14179 100644 --- a/include/boost/detail/shared_count.hpp +++ b/include/boost/detail/shared_count.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_DETAIL_SHARED_COUNT_HPP_INCLUDED #define BOOST_DETAIL_SHARED_COUNT_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/test/intrusive_ptr_test.cpp b/test/intrusive_ptr_test.cpp index f780d19..f8f305c 100644 --- a/test/intrusive_ptr_test.cpp +++ b/test/intrusive_ptr_test.cpp @@ -1,4 +1,7 @@ -#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__) +#include + +#if defined(BOOST_MSVC) + #pragma warning(disable: 4786) // identifier truncated in debug info #pragma warning(disable: 4710) // function not inlined #pragma warning(disable: 4711) // function selected for automatic inline expansion @@ -6,6 +9,11 @@ #pragma warning(disable: 4355) // 'this' : used in base member initializer list #pragma warning(disable: 4511) // copy constructor could not be generated #pragma warning(disable: 4512) // assignment operator could not be generated + +#if (BOOST_MSVC >= 1310) +#pragma warning(disable: 4675) // resolved overload found with Koenig lookup +#endif + #endif // diff --git a/test/shared_from_this_test.cpp b/test/shared_from_this_test.cpp index 2b40363..be40fc9 100644 --- a/test/shared_from_this_test.cpp +++ b/test/shared_from_this_test.cpp @@ -1,4 +1,6 @@ -#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__) +#include + +#if defined(BOOST_MSVC) #pragma warning(disable: 4786) // identifier truncated in debug info #pragma warning(disable: 4710) // function not inlined #pragma warning(disable: 4711) // function selected for automatic inline expansion diff --git a/test/shared_ptr_assign_fail.cpp b/test/shared_ptr_assign_fail.cpp index 993769a..4b6cc86 100644 --- a/test/shared_ptr_assign_fail.cpp +++ b/test/shared_ptr_assign_fail.cpp @@ -1,4 +1,6 @@ -#if defined(_MSC_VER) && !defined(__ICL) +#include + +#if defined(BOOST_MSVC) #pragma warning(disable: 4786) // identifier truncated in debug info #pragma warning(disable: 4710) // function not inlined #pragma warning(disable: 4711) // function selected for automatic inline expansion diff --git a/test/shared_ptr_basic_test.cpp b/test/shared_ptr_basic_test.cpp index 1b9c3cc..da8e902 100644 --- a/test/shared_ptr_basic_test.cpp +++ b/test/shared_ptr_basic_test.cpp @@ -1,3 +1,19 @@ +#include + +#if defined(BOOST_MSVC) + +#pragma warning(disable: 4786) // identifier truncated in debug info +#pragma warning(disable: 4710) // function not inlined +#pragma warning(disable: 4711) // function selected for automatic inline expansion +#pragma warning(disable: 4514) // unreferenced inline removed +#pragma warning(disable: 4355) // 'this' : used in base member initializer list + +#if (BOOST_MSVC >= 1310) +#pragma warning(disable: 4675) // resolved overload found with Koenig lookup +#endif + +#endif + // // shared_ptr_basic_test.cpp // diff --git a/test/shared_ptr_mt_test.cpp b/test/shared_ptr_mt_test.cpp index ec9d790..a70158f 100644 --- a/test/shared_ptr_mt_test.cpp +++ b/test/shared_ptr_mt_test.cpp @@ -1,4 +1,6 @@ -#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__) +#include + +#if defined(BOOST_MSVC) #pragma warning(disable: 4786) // identifier truncated in debug info #pragma warning(disable: 4710) // function not inlined #pragma warning(disable: 4711) // function selected for automatic inline expansion diff --git a/test/shared_ptr_test.cpp b/test/shared_ptr_test.cpp index a129613..8d3c7cc 100644 --- a/test/shared_ptr_test.cpp +++ b/test/shared_ptr_test.cpp @@ -1,9 +1,17 @@ -#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__) +#include + +#if defined(BOOST_MSVC) + #pragma warning(disable: 4786) // identifier truncated in debug info #pragma warning(disable: 4710) // function not inlined #pragma warning(disable: 4711) // function selected for automatic inline expansion #pragma warning(disable: 4514) // unreferenced inline removed #pragma warning(disable: 4355) // 'this' : used in base member initializer list + +#if (BOOST_MSVC >= 1310) +#pragma warning(disable: 4675) // resolved overload found with Koenig lookup +#endif + #endif // diff --git a/test/shared_ptr_timing_test.cpp b/test/shared_ptr_timing_test.cpp index d42b960..612ac39 100644 --- a/test/shared_ptr_timing_test.cpp +++ b/test/shared_ptr_timing_test.cpp @@ -1,4 +1,6 @@ -#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__) +#include + +#if defined(BOOST_MSVC) #pragma warning(disable: 4786) // identifier truncated in debug info #pragma warning(disable: 4710) // function not inlined #pragma warning(disable: 4711) // function selected for automatic inline expansion diff --git a/test/smart_ptr_test.cpp b/test/smart_ptr_test.cpp index 28e22a1..4baa92d 100644 --- a/test/smart_ptr_test.cpp +++ b/test/smart_ptr_test.cpp @@ -13,11 +13,19 @@ // 20 Jul 99 header name changed to .hpp // 20 Apr 99 additional error tests added. -#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__) +#include + +#if defined(BOOST_MSVC) + # pragma warning(disable: 4786) // identifier truncated in debug info # pragma warning(disable: 4710) // function not inlined # pragma warning(disable: 4711) // function selected for automatic inline expansion # pragma warning(disable: 4514) // unreferenced inline removed + +#if (BOOST_MSVC >= 1310) +# pragma warning(disable: 4675) // resolved overload found with Koenig lookup +#endif + #endif #ifdef __BORLANDC__ diff --git a/test/weak_ptr_test.cpp b/test/weak_ptr_test.cpp index 098d32d..8e8e534 100644 --- a/test/weak_ptr_test.cpp +++ b/test/weak_ptr_test.cpp @@ -1,9 +1,17 @@ -#if defined(_MSC_VER) && !defined(__ICL) && !defined(__COMO__) +#include + +#if defined(BOOST_MSVC) + #pragma warning(disable: 4786) // identifier truncated in debug info #pragma warning(disable: 4710) // function not inlined #pragma warning(disable: 4711) // function selected for automatic inline expansion #pragma warning(disable: 4514) // unreferenced inline removed #pragma warning(disable: 4355) // 'this' : used in base member initializer list + +#if (BOOST_MSVC >= 1310) +#pragma warning(disable: 4675) // resolved overload found with Koenig lookup +#endif + #endif //