[Boost-commit] svn:boost r85187 - trunk/boost/test/utils

Subject: [Boost-commit] svn:boost r85187 - trunk/boost/test/utils
From: andrey.semashev_at_[hidden]
Date: 2013-08-01 18:19:00

Author: andysem
Date: 2013-08-01 18:19:00 EDT (Thu, 01 Aug 2013)
New Revision: 85187
URL: http://svn.boost.org/trac/boost/changeset/85187

Log:
Attempt to work around Intel Compiler on Linux problem: error #453: protected function "noncopyable::noncopyable()" is not accessible.

Text files modified: 
   trunk/boost/test/utils/trivial_singleton.hpp |    14 ++++++++------                          
   1 files changed, 8 insertions(+), 6 deletions(-)

Modified: trunk/boost/test/utils/trivial_singleton.hpp
==============================================================================
--- trunk/boost/test/utils/trivial_singleton.hpp	Thu Aug  1 18:16:45 2013	(r85186)
+++ trunk/boost/test/utils/trivial_singleton.hpp	2013-08-01 18:19:00 EDT (Thu, 01 Aug 2013)	(r85187)
@@ -20,8 +20,6 @@
 #include <boost/detail/workaround.hpp>
 
 // Boost
-#include <boost/noncopyable.hpp>
-
 #include <boost/test/detail/suppress_warnings.hpp>
 
 //____________________________________________________________________________//
@@ -34,12 +32,16 @@
 // ************************************************************************** //
 
 template<typename Derived>
-class singleton : private boost::noncopyable {
+class singleton {
 public:
-    static Derived& instance() { static Derived the_inst; return the_inst; }    
+    static Derived& instance() { static Derived the_inst; return the_inst; }
+
+    BOOST_DELETED_FUNCTION(singleton(singleton const&))
+    BOOST_DELETED_FUNCTION(singleton& operator=(singleton const&))
+
 protected:
-    singleton()  {}
-    ~singleton() {}
+    BOOST_DEFAULTED_FUNCTION(singleton(), {})
+    BOOST_DEFAULTED_FUNCTION(~singleton(), {})
 };
 
 //____________________________________________________________________________//