aboutsummaryrefslogtreecommitdiff
path: root/paludis/output_manager_factory.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/output_manager_factory.hh
parent801afbbaf5570b96b4717147b3d7f6ff93454c8d (diff)
downloadpaludis-34700872057c99c57416612fbc264c48cfd38f9d.tar.gz
paludis-34700872057c99c57416612fbc264c48cfd38f9d.tar.xz
Kill NonCopyable, make Singleton its own thing
Diffstat (limited to 'paludis/output_manager_factory.hh')
-rw-r--r--paludis/output_manager_factory.hh9
1 files changed, 5 insertions, 4 deletions
diff --git a/paludis/output_manager_factory.hh b/paludis/output_manager_factory.hh
index 386e4e3c2..df1f5e187 100644
--- a/paludis/output_manager_factory.hh
+++ b/paludis/output_manager_factory.hh
@@ -23,9 +23,10 @@
#include <paludis/output_manager_factory-fwd.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/instantiation_policy.hh>
+#include <paludis/util/singleton.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/map-fwd.hh>
+#include <paludis/util/singleton.hh>
#include <paludis/output_manager-fwd.hh>
#include <paludis/util/set-fwd.hh>
#include <tr1/functional>
@@ -35,9 +36,9 @@ namespace paludis
{
class PALUDIS_VISIBLE OutputManagerFactory :
private PrivateImplementationPattern<OutputManagerFactory>,
- public InstantiationPolicy<OutputManagerFactory, instantiation_method::SingletonTag>
+ public Singleton<OutputManagerFactory>
{
- friend class InstantiationPolicy<OutputManagerFactory, instantiation_method::SingletonTag>;
+ friend class Singleton<OutputManagerFactory>;
private:
OutputManagerFactory();
@@ -102,7 +103,7 @@ namespace paludis
};
extern template class PrivateImplementationPattern<OutputManagerFactory>;
- extern template class InstantiationPolicy<OutputManagerFactory, instantiation_method::SingletonTag>;
+ extern template class Singleton<OutputManagerFactory>;
extern template class WrappedForwardIterator<OutputManagerFactory::ConstIteratorTag, const std::string>;
}