From 64cd268fc7658dd57e37a33db8e68f7b5ae4e97a Mon Sep 17 00:00:00 2001 From: Roland Schwarz Date: Mon, 30 Oct 2006 19:27:51 +0000 Subject: [PATCH] Get rid of dll import warnings for nocopyable classes [SVN r35796] --- include/boost/thread/barrier.hpp | 9 +++++++++ include/boost/thread/condition.hpp | 11 +++++++++-- include/boost/thread/mutex.hpp | 11 +++++++++-- include/boost/thread/read_write_mutex.hpp | 11 +++++++++-- include/boost/thread/recursive_mutex.hpp | 11 +++++++++-- include/boost/thread/thread.hpp | 11 +++++++++-- 6 files changed, 54 insertions(+), 10 deletions(-) diff --git a/include/boost/thread/barrier.hpp b/include/boost/thread/barrier.hpp index ea76d40f..bb1be49b 100644 --- a/include/boost/thread/barrier.hpp +++ b/include/boost/thread/barrier.hpp @@ -24,7 +24,16 @@ public: private: mutex m_mutex; +// 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 condition m_cond; +#ifdef BOOST_MSVC +# pragma warning(pop) +#endif unsigned int m_threshold; unsigned int m_count; unsigned int m_generation; diff --git a/include/boost/thread/condition.hpp b/include/boost/thread/condition.hpp index 39becb63..9fddf8de 100644 --- a/include/boost/thread/condition.hpp +++ b/include/boost/thread/condition.hpp @@ -22,7 +22,12 @@ 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 @@ -180,7 +185,9 @@ private: return ret; } }; - +#ifdef BOOST_MSVC +# pragma warning(pop) +#endif } // namespace boost // Change Log: diff --git a/include/boost/thread/mutex.hpp b/include/boost/thread/mutex.hpp index 487e6d45..6ad04f0f 100644 --- a/include/boost/thread/mutex.hpp +++ b/include/boost/thread/mutex.hpp @@ -23,7 +23,12 @@ 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 { @@ -150,7 +155,9 @@ private: threads::mac::detail::scoped_critical_region m_mutex_mutex; #endif }; - +#ifdef BOOST_MSVC +# pragma warning(pop) +#endif } // namespace boost // Change Log: diff --git a/include/boost/thread/read_write_mutex.hpp b/include/boost/thread/read_write_mutex.hpp index cb0139ce..0f3e325b 100644 --- a/include/boost/thread/read_write_mutex.hpp +++ b/include/boost/thread/read_write_mutex.hpp @@ -22,7 +22,12 @@ #include namespace boost { - +// 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 read_write_scheduling_policy { enum read_write_scheduling_policy_enum { @@ -260,7 +265,9 @@ private: detail::thread::read_write_mutex_impl m_impl; }; - +#ifdef BOOST_MSVC +# pragma warning(pop) +#endif } // namespace boost #endif diff --git a/include/boost/thread/recursive_mutex.hpp b/include/boost/thread/recursive_mutex.hpp index 09aa9431..a7efa48f 100644 --- a/include/boost/thread/recursive_mutex.hpp +++ b/include/boost/thread/recursive_mutex.hpp @@ -23,7 +23,12 @@ 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 recursive_mutex : private noncopyable { @@ -164,7 +169,9 @@ private: std::size_t m_count; #endif }; - +#ifdef BOOST_MSVC +# pragma warning(pop) +#endif } // namespace boost #endif // BOOST_RECURSIVE_MUTEX_WEK070601_HPP diff --git a/include/boost/thread/thread.hpp b/include/boost/thread/thread.hpp index a3575ee2..64ab35c7 100644 --- a/include/boost/thread/thread.hpp +++ b/include/boost/thread/thread.hpp @@ -25,7 +25,12 @@ 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: @@ -71,7 +76,9 @@ private: std::list m_threads; mutex m_mutex; }; - +#ifdef BOOST_MSVC +# pragma warning(pop) +#endif } // namespace boost // Change Log: