[Boost-commit] svn:boost r86698 - trunk/boost/thread

Subject: [Boost-commit] svn:boost r86698 - trunk/boost/thread
From: vicente.botet_at_[hidden]
Date: 2013-11-14 13:53:51

Author: viboes
Date: 2013-11-14 13:53:51 EST (Thu, 14 Nov 2013)
New Revision: 86698
URL: http://svn.boost.org/trac/boost/changeset/86698

Log:
Thread: try to remove warning C4520: 'boost::executor_adaptor<boost::thread_pool>' : multiple default constructors specified.

Text files modified: 
   trunk/boost/thread/executor.hpp |    10 +++++-----                              
   1 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/thread/executor.hpp
==============================================================================
--- trunk/boost/thread/executor.hpp	Thu Nov 14 12:56:07 2013	(r86697)
+++ trunk/boost/thread/executor.hpp	2013-11-14 13:53:51 EST (Thu, 14 Nov 2013)	(r86698)
@@ -136,15 +136,15 @@
     /**
      * executor_adaptor constructor
      */
-    executor_adaptor() : ex() {}
-
-    /**
-     * executor_adaptor constructor
-     */
 #if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
     template <typename ...Args>
     executor_adaptor(BOOST_THREAD_RV_REF(Args) ... args) : ex(boost::forward<Args>(args)...) {}
 #else
+    /**
+     * executor_adaptor constructor
+     */
+    executor_adaptor() : ex() {}
+
     template <typename A1>
     executor_adaptor(
         BOOST_THREAD_FWD_REF(A1) a1