From 893069311aa0261ec27fe53b52ddd4970cc76bea Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 9 Aug 2002 14:34:23 +0000 Subject: [PATCH] function_base.hpp: - Use the BOOST_FUNCTION_SILENT_DEPRECATED macro as a signal to turn off all "deprecated" warnings [SVN r14756] --- include/boost/function/function_base.hpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp index 4f232ef..04e0a6e 100644 --- a/include/boost/function/function_base.hpp +++ b/include/boost/function/function_base.hpp @@ -1,6 +1,6 @@ // Boost.Function library -// Copyright (C) 2001 Doug Gregor (gregod@cs.rpi.edu) +// Copyright (C) 2001, 2002 Doug Gregor (gregod@cs.rpi.edu) // // Permission to copy, use, sell and distribute this software is granted // provided this copyright notice appears in all copies. @@ -32,12 +32,17 @@ # define BOOST_FUNCTION_TARGET_FIX(x) #endif // not MSVC -#if defined (BOOST_MSVC) && (BOOST_MSVC >= 1300) -# define BOOST_FUNCTION_DEPRECATED_PRE __declspec(deprecated) +#ifdef BOOST_FUNCTION_SILENT_DEPRECATED +# define BOOST_FUNCTION_DEPRECATED_PRE # define BOOST_FUNCTION_DEPRECATED_INNER #else -# define BOOST_FUNCTION_DEPRECATED_PRE -# define BOOST_FUNCTION_DEPRECATED_INNER int deprecated; +# if defined (BOOST_MSVC) && (BOOST_MSVC >= 1300) +# define BOOST_FUNCTION_DEPRECATED_PRE __declspec(deprecated) +# define BOOST_FUNCTION_DEPRECATED_INNER +# else +# define BOOST_FUNCTION_DEPRECATED_PRE +# define BOOST_FUNCTION_DEPRECATED_INNER int deprecated; +# endif #endif namespace boost {