Imported Upstream version 1.57.0

[platform/upstream/boost.git] / boost / asio / detail / noncopyable.hpp

diff --git a/boost/asio/detail/noncopyable.hpp b/boost/asio/detail/noncopyable.hpp
index 5f7e8cc..6aae476 100644 (file)
--- a/boost/asio/detail/noncopyable.hpp
+++ b/boost/asio/detail/noncopyable.hpp
@@ -2,7 +2,7 @@
 // detail/noncopyable.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2012 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2014 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,8 +16,6 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/detail/workaround.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -25,10 +23,6 @@ namespace boost {
 namespace asio {
 namespace detail {
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-// Redefine the noncopyable class for Borland C++ since that compiler does not
-// apply the empty base optimisation unless the base class contains a dummy
-// char data member.
 class noncopyable
 {
 protected:
@@ -37,11 +31,7 @@ protected:
 private:
   noncopyable(const noncopyable&);
   const noncopyable& operator=(const noncopyable&);
-  char dummy_;
 };
-#else
-using boost::noncopyable;
-#endif
 
 } // namespace detail