aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-06-30 20:02:51 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-06-30 20:02:51 +0100
commit76dc1cfafcb9e97972693f2574f06934c5f4b0e8 (patch)
tree097fa903961efe7652c5ebbf16a5b7c6cb104ca9
parent8a36a1163bb36cd2fa0bdfe79a63e22be6595408 (diff)
downloadpaludis-76dc1cfafcb9e97972693f2574f06934c5f4b0e8.tar.gz
paludis-76dc1cfafcb9e97972693f2574f06934c5f4b0e8.tar.xz
No need to NonCopyable PIMPs
-rw-r--r--paludis/repositories/e/profile.hh3
-rw-r--r--paludis/repository.hh1
-rw-r--r--paludis/util/action_queue.hh1
-rw-r--r--paludis/util/buffer_output_stream.hh1
-rw-r--r--paludis/util/damerau_levenshtein.hh1
-rw-r--r--paludis/util/executor.hh1
-rw-r--r--paludis/util/options.hh3
-rw-r--r--paludis/util/private_implementation_pattern.hh7
-rw-r--r--paludis/util/string_list_stream.hh1
-rw-r--r--python/exception.hh1
10 files changed, 13 insertions, 7 deletions
diff --git a/paludis/repositories/e/profile.hh b/paludis/repositories/e/profile.hh
index bfbb778..ae52592 100644
--- a/paludis/repositories/e/profile.hh
+++ b/paludis/repositories/e/profile.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -32,6 +32,7 @@
#include <paludis/util/tribool.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
#include <paludis/util/map-fwd.hh>
+#include <paludis/util/instantiation_policy.hh>
#include <paludis/repositories/e/e_repository_id.hh>
#include <string>
diff --git a/paludis/repository.hh b/paludis/repository.hh
index 1b326b9..9990040 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -33,6 +33,7 @@
#include <paludis/util/options.hh>
#include <paludis/util/named_value.hh>
#include <paludis/util/timestamp.hh>
+#include <paludis/util/instantiation_policy.hh>
#include <paludis/output_manager-fwd.hh>
#include <paludis/version_spec.hh>
#include <paludis/metadata_key-fwd.hh>
diff --git a/paludis/util/action_queue.hh b/paludis/util/action_queue.hh
index 10f9744..dffb518 100644
--- a/paludis/util/action_queue.hh
+++ b/paludis/util/action_queue.hh
@@ -21,6 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_UTIL_ACTION_QUEUE_HH 1
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/attributes.hh>
#include <tr1/functional>
namespace paludis
diff --git a/paludis/util/buffer_output_stream.hh b/paludis/util/buffer_output_stream.hh
index d2339d1..9136c3c 100644
--- a/paludis/util/buffer_output_stream.hh
+++ b/paludis/util/buffer_output_stream.hh
@@ -22,6 +22,7 @@
#include <paludis/util/buffer_output_stream-fwd.hh>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/attributes.hh>
#include <ostream>
namespace paludis
diff --git a/paludis/util/damerau_levenshtein.hh b/paludis/util/damerau_levenshtein.hh
index adbb911..70c418d 100644
--- a/paludis/util/damerau_levenshtein.hh
+++ b/paludis/util/damerau_levenshtein.hh
@@ -21,6 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_DAMERAU_LEVENSHTEIN_HH 1
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/attributes.hh>
#include <string>
/** \file
diff --git a/paludis/util/executor.hh b/paludis/util/executor.hh
index 2a83f3f..e5787a3 100644
--- a/paludis/util/executor.hh
+++ b/paludis/util/executor.hh
@@ -22,6 +22,7 @@
#include <paludis/util/executor-fwd.hh>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/attributes.hh>
#include <string>
#include <tr1/memory>
diff --git a/paludis/util/options.hh b/paludis/util/options.hh
index ea757ee..a539f42 100644
--- a/paludis/util/options.hh
+++ b/paludis/util/options.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2009 Ciaran McCreesh
+ * Copyright (c) 2007, 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -22,6 +22,7 @@
#include <paludis/util/options-fwd.hh>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/attributes.hh>
/** \file
* Declarations for the Options<> class.
diff --git a/paludis/util/private_implementation_pattern.hh b/paludis/util/private_implementation_pattern.hh
index 91b111b..bf8963d 100644
--- a/paludis/util/private_implementation_pattern.hh
+++ b/paludis/util/private_implementation_pattern.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -20,8 +20,6 @@
#ifndef PALUDIS_GUARD_PALUDIS_PRIVATE_IMPLEMENTATION_PATTERN_HH
#define PALUDIS_GUARD_PALUDIS_PRIVATE_IMPLEMENTATION_PATTERN_HH 1
-#include <paludis/util/instantiation_policy.hh>
-
/** \file
* Declarations for the PrivateImplementationPattern pattern.
*
@@ -50,8 +48,7 @@ namespace paludis
* \ingroup g_oo
*/
template <typename C_>
- class PrivateImplementationPattern :
- private InstantiationPolicy<PrivateImplementationPattern<C_>, instantiation_method::NonCopyableTag>
+ class PrivateImplementationPattern
{
protected:
/**
diff --git a/paludis/util/string_list_stream.hh b/paludis/util/string_list_stream.hh
index dec6b8e..e11d9fd 100644
--- a/paludis/util/string_list_stream.hh
+++ b/paludis/util/string_list_stream.hh
@@ -22,6 +22,7 @@
#include <paludis/util/string_list_stream-fwd.hh>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/attributes.hh>
#include <istream>
#include <ostream>
diff --git a/python/exception.hh b/python/exception.hh
index 6eb09f0..a9272c2 100644
--- a/python/exception.hh
+++ b/python/exception.hh
@@ -22,6 +22,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/exception.hh>
+#include <paludis/util/instantiation_policy.hh>
#include <boost/python.hpp>
#include <tr1/memory>
#include <tr1/functional>