Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r60525 - trunk/boost/type_traits
From: john_at_[hidden]
Date: 2010-03-12 11:57:29


Author: johnmaddock
Date: 2010-03-12 11:57:29 EST (Fri, 12 Mar 2010)
New Revision: 60525
URL: http://svn.boost.org/trac/boost/changeset/60525

Log:
Fixes #4000.
Text files modified:
   trunk/boost/type_traits/is_empty.hpp | 10 ++++++++++
   1 files changed, 10 insertions(+), 0 deletions(-)

Modified: trunk/boost/type_traits/is_empty.hpp
==============================================================================
--- trunk/boost/type_traits/is_empty.hpp (original)
+++ trunk/boost/type_traits/is_empty.hpp 2010-03-12 11:57:29 EST (Fri, 12 Mar 2010)
@@ -36,6 +36,12 @@
 namespace detail {
 
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4624) // destructor could not be generated
+#endif
+
 template <typename T>
 struct empty_helper_t1 : public T
 {
@@ -47,6 +53,10 @@
    empty_helper_t1& operator=(const empty_helper_t1&);
 };
 
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
 struct empty_helper_t2 { int i[256]; };
 
 #if !BOOST_WORKAROUND(__BORLANDC__, < 0x600)


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk