From af774310ef6792893bcbed37cce87a07c2751bba Mon Sep 17 00:00:00 2001 From: Roland Schwarz Date: Fri, 22 Sep 2006 17:00:21 +0000 Subject: [PATCH] disable MSVC DLL warnings for derivation from noncopyable [SVN r35281] --- include/boost/thread/pthread/condition.hpp | 11 +++++++++++ include/boost/thread/pthread/mutex.hpp | 11 +++++++++++ include/boost/thread/pthread/thread.hpp | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/include/boost/thread/pthread/condition.hpp b/include/boost/thread/pthread/condition.hpp index 7c988c96..ae4e64e2 100644 --- a/include/boost/thread/pthread/condition.hpp +++ b/include/boost/thread/pthread/condition.hpp @@ -21,6 +21,13 @@ namespace boost { struct xtime; +// disable warnings about non dll import +// see: http://www.boost.org/more/separate_compilation.html#dlls +#ifdef BOOST_MSVC +# pragma warning(push) +# pragma warning(disable: 4251 4231 4660 4275) +#endif + namespace detail { class BOOST_THREAD_DECL condition_impl : private noncopyable @@ -140,6 +147,10 @@ private: } }; +#ifdef BOOST_MSVC +# pragma warning(pop) +#endif + } // namespace boost #endif // BOOST_CONDITION_RS06040707_HPP diff --git a/include/boost/thread/pthread/mutex.hpp b/include/boost/thread/pthread/mutex.hpp index f9eb80e5..a38c1bb1 100644 --- a/include/boost/thread/pthread/mutex.hpp +++ b/include/boost/thread/pthread/mutex.hpp @@ -20,6 +20,13 @@ namespace boost { struct xtime; +// disable warnings about non dll import +// see: http://www.boost.org/more/separate_compilation.html#dlls +#ifdef BOOST_MSVC +# pragma warning(push) +# pragma warning(disable: 4251 4231 4660 4275) +#endif + class BOOST_THREAD_DECL mutex : private noncopyable { @@ -100,6 +107,10 @@ private: bool m_locked; }; +#ifdef BOOST_MSVC +# pragma warning(pop) +#endif + } // namespace boost #endif // BOOST_MUTEX_RS06040705_HPP diff --git a/include/boost/thread/pthread/thread.hpp b/include/boost/thread/pthread/thread.hpp index 3fe1edea..7df2dc9c 100644 --- a/include/boost/thread/pthread/thread.hpp +++ b/include/boost/thread/pthread/thread.hpp @@ -22,6 +22,13 @@ namespace boost { struct xtime; +// disable warnings about non dll import +// see: http://www.boost.org/more/separate_compilation.html#dlls +#ifdef BOOST_MSVC +# pragma warning(push) +# pragma warning(disable: 4251 4231 4660 4275) +#endif + class BOOST_THREAD_DECL thread : private noncopyable { public: @@ -59,6 +66,10 @@ private: mutex m_mutex; }; +#ifdef BOOST_MSVC +# pragma warning(pop) +#endif + } // namespace boost #endif // BOOST_THREAD_RS06040701_HPP