Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r80412 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2012-09-05 15:02:30


Author: danieljames
Date: 2012-09-05 15:02:29 EDT (Wed, 05 Sep 2012)
New Revision: 80412
URL: http://svn.boost.org/trac/boost/changeset/80412

Log:
Unordered: Move MSVC warning suppression to correct location.
Text files modified:
   trunk/boost/unordered/detail/buckets.hpp | 9 ---------
   trunk/boost/unordered/detail/table.hpp | 9 +++++++++
   2 files changed, 9 insertions(+), 9 deletions(-)

Modified: trunk/boost/unordered/detail/buckets.hpp
==============================================================================
--- trunk/boost/unordered/detail/buckets.hpp (original)
+++ trunk/boost/unordered/detail/buckets.hpp 2012-09-05 15:02:29 EDT (Wed, 05 Sep 2012)
@@ -20,11 +20,6 @@
 #include <boost/limits.hpp>
 #include <boost/iterator.hpp>
 
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-#pragma warning(disable:4127) // conditional expression is constant
-#endif
-
 namespace boost { namespace unordered { namespace detail {
 
     template <typename Types> struct table;
@@ -799,8 +794,4 @@
 #endif
 }}}
 
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
-
 #endif

Modified: trunk/boost/unordered/detail/table.hpp
==============================================================================
--- trunk/boost/unordered/detail/table.hpp (original)
+++ trunk/boost/unordered/detail/table.hpp 2012-09-05 15:02:29 EDT (Wed, 05 Sep 2012)
@@ -13,6 +13,11 @@
 #include <boost/type_traits/alignment_of.hpp>
 #include <cmath>
 
+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#pragma warning(disable:4127) // conditional expression is constant
+#endif
+
 namespace boost { namespace unordered { namespace detail {
 
     ////////////////////////////////////////////////////////////////////////////
@@ -895,4 +900,8 @@
     }
 }}}
 
+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
 #endif


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