unique_ptr.h: (unique_ptr<>:: unique_ptr(const unique_ptr<_Up...

[thirdparty/gcc.git] / libstdc++-v3 / include / bits / shared_ptr_base.h

diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h
index ff1282d56200a2b7489af8f210cafacd1f3273e1..51bd51d471856a3096041c3a4233f856e1ddeb48 100644 (file)
--- a/libstdc++-v3/include/bits/shared_ptr_base.h
+++ b/libstdc++-v3/include/bits/shared_ptr_base.h
@@ -1,6 +1,6 @@
 // shared_ptr and weak_ptr implementation details -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -606,9 +606,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
          _M_ptr = __r._M_ptr;
        }
 
-      template<typename _Tp1, typename _Del>
-       explicit __shared_ptr(const std::unique_ptr<_Tp1, _Del>&) = delete;
-
       // If an exception is thrown this constructor has no effect.
       template<typename _Tp1, typename _Del>
        explicit __shared_ptr(std::unique_ptr<_Tp1, _Del>&& __r)
@@ -668,10 +665,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
          return *this;
        }
 
-      template<typename _Tp1, typename _Del>
-       __shared_ptr&
-       operator=(const std::unique_ptr<_Tp1, _Del>& __r) = delete;
-
       template<typename _Tp1, typename _Del>
        __shared_ptr&
        operator=(std::unique_ptr<_Tp1, _Del>&& __r)