From 7feefb7313103e63bc34eca274fad4d7bdbbef9c 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] --- bind_as_compose.cpp | 4 +++- bind_visitor.cpp | 4 +++- include/boost/bind.hpp | 2 ++ include/boost/bind/arg.hpp | 2 ++ include/boost/bind/placeholders.hpp | 2 ++ include/boost/mem_fn.hpp | 6 ++++-- test/bind_fastcall_mf_test.cpp | 4 +++- test/bind_fastcall_test.cpp | 4 +++- test/bind_stdcall_mf_test.cpp | 4 +++- test/bind_stdcall_test.cpp | 4 +++- test/bind_test.cpp | 4 +++- test/mem_fn_derived_test.cpp | 4 +++- test/mem_fn_fastcall_test.cpp | 4 +++- test/mem_fn_stdcall_test.cpp | 4 +++- test/mem_fn_test.cpp | 4 +++- test/mem_fn_void_test.cpp | 4 +++- 16 files changed, 46 insertions(+), 14 deletions(-) diff --git a/bind_as_compose.cpp b/bind_as_compose.cpp index 0997697..13b2968 100644 --- a/bind_as_compose.cpp +++ b/bind_as_compose.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/bind_visitor.cpp b/bind_visitor.cpp index c1dee03..ac274bd 100644 --- a/bind_visitor.cpp +++ b/bind_visitor.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/include/boost/bind.hpp b/include/boost/bind.hpp index 15ab8c7..0613a89 100644 --- a/include/boost/bind.hpp +++ b/include/boost/bind.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_BIND_HPP_INCLUDED #define BOOST_BIND_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/include/boost/bind/arg.hpp b/include/boost/bind/arg.hpp index cac6521..a31615d 100644 --- a/include/boost/bind/arg.hpp +++ b/include/boost/bind/arg.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_BIND_ARG_HPP_INCLUDED #define BOOST_BIND_ARG_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/include/boost/bind/placeholders.hpp b/include/boost/bind/placeholders.hpp index 2c05a19..cf40c78 100644 --- a/include/boost/bind/placeholders.hpp +++ b/include/boost/bind/placeholders.hpp @@ -1,6 +1,8 @@ #ifndef BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED #define BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED +// MS compatible compilers support #pragma once + #if defined(_MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif diff --git a/include/boost/mem_fn.hpp b/include/boost/mem_fn.hpp index 23848e4..1e5f606 100644 --- a/include/boost/mem_fn.hpp +++ b/include/boost/mem_fn.hpp @@ -1,8 +1,10 @@ #ifndef BOOST_MEM_FN_HPP_INCLUDED #define BOOST_MEM_FN_HPP_INCLUDED -#if _MSC_VER+0 >= 1020 -#pragma once +// MS compatible compilers support #pragma once + +#if defined(_MSC_VER) && (_MSC_VER >= 1020) +# pragma once #endif // diff --git a/test/bind_fastcall_mf_test.cpp b/test/bind_fastcall_mf_test.cpp index e30a7b5..6d60152 100644 --- a/test/bind_fastcall_mf_test.cpp +++ b/test/bind_fastcall_mf_test.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/bind_fastcall_test.cpp b/test/bind_fastcall_test.cpp index e2ae97a..aa9c555 100644 --- a/test/bind_fastcall_test.cpp +++ b/test/bind_fastcall_test.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/bind_stdcall_mf_test.cpp b/test/bind_stdcall_mf_test.cpp index b3efa4d..ee73f55 100644 --- a/test/bind_stdcall_mf_test.cpp +++ b/test/bind_stdcall_mf_test.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/bind_stdcall_test.cpp b/test/bind_stdcall_test.cpp index a463c55..6520257 100644 --- a/test/bind_stdcall_test.cpp +++ b/test/bind_stdcall_test.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/bind_test.cpp b/test/bind_test.cpp index 07c291e..c5aa4f2 100644 --- a/test/bind_test.cpp +++ b/test/bind_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/mem_fn_derived_test.cpp b/test/mem_fn_derived_test.cpp index e09d38b..9b51a98 100644 --- a/test/mem_fn_derived_test.cpp +++ b/test/mem_fn_derived_test.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/mem_fn_fastcall_test.cpp b/test/mem_fn_fastcall_test.cpp index ca26273..2162694 100644 --- a/test/mem_fn_fastcall_test.cpp +++ b/test/mem_fn_fastcall_test.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/mem_fn_stdcall_test.cpp b/test/mem_fn_stdcall_test.cpp index a1f5357..ca5d75f 100644 --- a/test/mem_fn_stdcall_test.cpp +++ b/test/mem_fn_stdcall_test.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/mem_fn_test.cpp b/test/mem_fn_test.cpp index 20321c9..4a8bfbf 100644 --- a/test/mem_fn_test.cpp +++ b/test/mem_fn_test.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/mem_fn_void_test.cpp b/test/mem_fn_void_test.cpp index ad9c5df..f7f4aeb 100644 --- a/test/mem_fn_void_test.cpp +++ b/test/mem_fn_void_test.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