From: Michael Andres Date: Mon, 2 Sep 2013 14:40:32 +0000 (+0200) Subject: Don't need COW implementation in NonCopyable KeyRing. X-Git-Tag: upstream/14.27.0~237 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b257fb2e0259082de6c403094b6d2330ea0a01c;p=platform%2Fupstream%2Flibzypp.git Don't need COW implementation in NonCopyable KeyRing. --- diff --git a/zypp/KeyRing.cc b/zypp/KeyRing.cc index b97f095..cb4c719 100644 --- a/zypp/KeyRing.cc +++ b/zypp/KeyRing.cc @@ -249,20 +249,6 @@ namespace zypp * \endcode */ CachedPublicKeyData cachedPublicKeyData; - - public: - /** Offer default Impl. */ - static shared_ptr nullimpl() - { - static shared_ptr _nullimpl( new Impl( filesystem::TmpPath::defaultLocation() ) ); - return _nullimpl; - } - - private: - friend Impl * rwcowClone( const Impl * rhs ); - /** clone for RWCOW_pointer */ - Impl * clone() const - { return new Impl( *this ); } }; /////////////////////////////////////////////////////////////////// diff --git a/zypp/KeyRing.h b/zypp/KeyRing.h index c45c330..090ca5d 100644 --- a/zypp/KeyRing.h +++ b/zypp/KeyRing.h @@ -282,7 +282,7 @@ namespace zypp private: /** Pointer to implementation */ - RWCOW_pointer _pimpl; + RW_pointer _pimpl; }; ///////////////////////////////////////////////////////////////////