[Boost-commit] svn:boost r85281 - trunk/boost/unordered/detail

Subject: [Boost-commit] svn:boost r85281 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2013-08-10 09:09:28

Author: danieljames
Date: 2013-08-10 09:09:28 EDT (Sat, 10 Aug 2013)
New Revision: 85281
URL: http://svn.boost.org/trac/boost/changeset/85281

Log:
Avoid Visual C++ warning.

Avoiding:

    warning C4127: conditional expression is constant

Text files modified: 
   trunk/boost/unordered/detail/buckets.hpp |    20 ++++++++++----------                    
   1 files changed, 10 insertions(+), 10 deletions(-)

Modified: trunk/boost/unordered/detail/buckets.hpp
==============================================================================
--- trunk/boost/unordered/detail/buckets.hpp	Sat Aug 10 09:09:08 2013	(r85280)
+++ trunk/boost/unordered/detail/buckets.hpp	2013-08-10 09:09:28 EDT (Sat, 10 Aug 2013)	(r85281)
@@ -727,15 +727,18 @@
             new((void*) &funcs_[which]) function_pair(hf, eq);
         }
 
-        void construct(bool which, function_pair const& f)
+        void construct(bool which, function_pair const& f,
+                boost::unordered::detail::false_type =
+                    boost::unordered::detail::false_type())
         {
             new((void*) &funcs_[which]) function_pair(f);
         }
         
         void construct(bool which, function_pair& f,
-                boost::unordered::detail::move_tag m)
+                boost::unordered::detail::true_type)
         {
-            new((void*) &funcs_[which]) function_pair(f, m);
+            new((void*) &funcs_[which]) function_pair(f,
+                boost::unordered::detail::move_tag());
         }
 
         void destroy(bool which)
@@ -760,15 +763,12 @@
             construct(current_, bf.current());
         }
 
-        functions(functions& bf, boost::unordered::detail::move_tag m)
+        functions(functions& bf, boost::unordered::detail::move_tag)
             : current_(false)
         {
-            if (nothrow_move_constructible) {
-                construct(current_, bf.current(), m);
-            }
-            else {
-                construct(current_, bf.current());
-            }
+            construct(current_, bf.current(),
+                boost::unordered::detail::integral_constant<bool,
+                    nothrow_move_constructible>());
         }
 
         ~functions() {