aboutsummaryrefslogtreecommitdiff
path: root/paludis/contents.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 09:21:59 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 18:54:47 +0100
commit34700872057c99c57416612fbc264c48cfd38f9d (patch)
tree044975f3c70d18160b5a431f71fad75dbe16af88 /paludis/contents.hh
parent801afbbaf5570b96b4717147b3d7f6ff93454c8d (diff)
downloadpaludis-34700872057c99c57416612fbc264c48cfd38f9d.tar.gz
paludis-34700872057c99c57416612fbc264c48cfd38f9d.tar.xz
Kill NonCopyable, make Singleton its own thing
Diffstat (limited to 'paludis/contents.hh')
-rw-r--r--paludis/contents.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/paludis/contents.hh b/paludis/contents.hh
index 2b8f943..ef0878e 100644
--- a/paludis/contents.hh
+++ b/paludis/contents.hh
@@ -22,7 +22,6 @@
#include <paludis/contents-fwd.hh>
#include <paludis/util/simple_visitor.hh>
-#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/type_list.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -200,7 +199,6 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE Contents :
- private InstantiationPolicy<Contents, instantiation_method::NonCopyableTag>,
private PrivateImplementationPattern<Contents>
{
public:
@@ -210,6 +208,9 @@ namespace paludis
Contents();
~Contents();
+ Contents(const Contents &) = delete;
+ Contents & operator= (const Contents &) = delete;
+
///\}
/// Add a new entry.
@@ -230,7 +231,6 @@ namespace paludis
///\}
};
- extern template class InstantiationPolicy<Contents, instantiation_method::NonCopyableTag>;
extern template class PrivateImplementationPattern<Contents>;
extern template class PrivateImplementationPattern<ContentsEntry>;
extern template class PrivateImplementationPattern<ContentsSymEntry>;