aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-01 13:23:25 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-01 13:23:25 +0000
commit86ebe09b66faeec132016b04fd192752b0874d50 (patch)
tree1e4adf78c1f13d76d018d7a1133b4a69f11d6ac6 /src
parentf0367218d0a0dbffbb46ce627318e54baa844952 (diff)
downloadpaludis-86ebe09b66faeec132016b04fd192752b0874d50.tar.gz
paludis-86ebe09b66faeec132016b04fd192752b0874d50.tar.xz
Code cleanup. Fixes: ticket:266, ticket:267
Diffstat (limited to 'src')
-rw-r--r--src/clients/adjutrix/command_line.cc3
-rw-r--r--src/clients/contrarius/command_line.cc3
-rw-r--r--src/clients/contrarius/target_config.cc4
-rw-r--r--src/clients/inquisitio/command_line.cc3
-rw-r--r--src/clients/inquisitio/description_extractor.cc1
-rw-r--r--src/clients/inquisitio/extractor.cc4
-rw-r--r--src/clients/inquisitio/matcher.cc4
-rw-r--r--src/clients/inquisitio/matcher.hh1
-rw-r--r--src/clients/inquisitio/name_extractor.cc2
-rw-r--r--src/clients/inquisitio/pcre_matcher.cc1
-rw-r--r--src/clients/inquisitio/text_matcher.cc1
-rw-r--r--src/clients/paludis/command_line.cc3
-rw-r--r--src/clients/qualudis/qualudis_command_line.cc3
-rw-r--r--src/common_args/deps_option_arg.cc3
-rw-r--r--src/output/console_query_task.cc1
15 files changed, 36 insertions, 1 deletions
diff --git a/src/clients/adjutrix/command_line.cc b/src/clients/adjutrix/command_line.cc
index 6bd795d00..f712bf47b 100644
--- a/src/clients/adjutrix/command_line.cc
+++ b/src/clients/adjutrix/command_line.cc
@@ -19,6 +19,9 @@
#include "command_line.hh"
#include <paludis/name.hh>
+#include <paludis/util/instantiation_policy-impl.hh>
+
+template class paludis::InstantiationPolicy<CommandLine, paludis::instantiation_method::SingletonTag>;
CommandLine::CommandLine() :
ArgsHandler(),
diff --git a/src/clients/contrarius/command_line.cc b/src/clients/contrarius/command_line.cc
index e4ea84d1d..013fdee1e 100644
--- a/src/clients/contrarius/command_line.cc
+++ b/src/clients/contrarius/command_line.cc
@@ -18,6 +18,9 @@
*/
#include "command_line.hh"
+#include <paludis/util/instantiation_policy-impl.hh>
+
+template class paludis::InstantiationPolicy<CommandLine, paludis::instantiation_method::SingletonTag>;
CommandLine::CommandLine() :
ArgsHandler(),
diff --git a/src/clients/contrarius/target_config.cc b/src/clients/contrarius/target_config.cc
index bc4fa24a4..5dd75bc5f 100644
--- a/src/clients/contrarius/target_config.cc
+++ b/src/clients/contrarius/target_config.cc
@@ -19,6 +19,8 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/tokeniser.hh>
+#include <paludis/util/stringify.hh>
+#include <paludis/util/instantiation_policy-impl.hh>
#include <paludis/config_file.hh>
#include <list>
#include <string>
@@ -29,6 +31,8 @@
using namespace paludis;
+template class InstantiationPolicy<TargetConfig, instantiation_method::SingletonTag>;
+
void
TargetConfig::_parse_defaults()
{
diff --git a/src/clients/inquisitio/command_line.cc b/src/clients/inquisitio/command_line.cc
index 44440c4aa..b99d974f4 100644
--- a/src/clients/inquisitio/command_line.cc
+++ b/src/clients/inquisitio/command_line.cc
@@ -19,9 +19,12 @@
#include "command_line.hh"
#include <paludis/name.hh>
+#include <paludis/util/instantiation_policy-impl.hh>
using namespace paludis;
+template class paludis::InstantiationPolicy<CommandLine, paludis::instantiation_method::SingletonTag>;
+
CommandLine::CommandLine() :
ArgsHandler(),
diff --git a/src/clients/inquisitio/description_extractor.cc b/src/clients/inquisitio/description_extractor.cc
index 7c3d919f7..ec4b26b75 100644
--- a/src/clients/inquisitio/description_extractor.cc
+++ b/src/clients/inquisitio/description_extractor.cc
@@ -19,6 +19,7 @@
#include "description_extractor.hh"
#include <paludis/package_database.hh>
+#include <paludis/util/private_implementation_pattern-impl.hh>
using namespace paludis;
using namespace inquisitio;
diff --git a/src/clients/inquisitio/extractor.cc b/src/clients/inquisitio/extractor.cc
index 2762f9c69..deb25e8fa 100644
--- a/src/clients/inquisitio/extractor.cc
+++ b/src/clients/inquisitio/extractor.cc
@@ -21,6 +21,8 @@
#include "description_extractor.hh"
#include "name_extractor.hh"
#include <paludis/util/virtual_constructor-impl.hh>
+#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/instantiation_policy-impl.hh>
using namespace inquisitio;
using namespace paludis;
@@ -29,6 +31,8 @@ template class paludis::VirtualConstructor<std::string,
tr1::shared_ptr<Extractor> (*) (const paludis::Environment &),
paludis::virtual_constructor_not_found::ThrowException<NoSuchExtractorError> >;
+template class paludis::InstantiationPolicy<ExtractorMaker, paludis::instantiation_method::SingletonTag>;
+
NoSuchExtractorError::NoSuchExtractorError(const std::string & m) throw () :
Exception("No such extractor '" + m + "'")
{
diff --git a/src/clients/inquisitio/matcher.cc b/src/clients/inquisitio/matcher.cc
index 2a24fca1b..a184f45fb 100644
--- a/src/clients/inquisitio/matcher.cc
+++ b/src/clients/inquisitio/matcher.cc
@@ -21,6 +21,8 @@
#include "pcre_matcher.hh"
#include "text_matcher.hh"
#include <paludis/util/virtual_constructor-impl.hh>
+#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/instantiation_policy-impl.hh>
using namespace inquisitio;
using namespace paludis;
@@ -29,6 +31,8 @@ template class paludis::VirtualConstructor<std::string,
tr1::shared_ptr<Matcher> (*) (const std::string &),
paludis::virtual_constructor_not_found::ThrowException<NoSuchMatcherError> >;
+template class paludis::InstantiationPolicy<MatcherMaker, paludis::instantiation_method::SingletonTag>;
+
Matcher::Matcher()
{
}
diff --git a/src/clients/inquisitio/matcher.hh b/src/clients/inquisitio/matcher.hh
index e1f3be0e0..fcb68917c 100644
--- a/src/clients/inquisitio/matcher.hh
+++ b/src/clients/inquisitio/matcher.hh
@@ -23,6 +23,7 @@
#include <string>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/sr.hh>
+#include <paludis/util/tr1_memory.hh>
#include <paludis/util/virtual_constructor.hh>
namespace inquisitio
diff --git a/src/clients/inquisitio/name_extractor.cc b/src/clients/inquisitio/name_extractor.cc
index 780bb127e..983616e2a 100644
--- a/src/clients/inquisitio/name_extractor.cc
+++ b/src/clients/inquisitio/name_extractor.cc
@@ -18,6 +18,8 @@
*/
#include "name_extractor.hh"
+#include <paludis/util/stringify.hh>
+#include <paludis/util/private_implementation_pattern-impl.hh>
using namespace inquisitio;
using namespace paludis;
diff --git a/src/clients/inquisitio/pcre_matcher.cc b/src/clients/inquisitio/pcre_matcher.cc
index 015c8b1f1..e91af823e 100644
--- a/src/clients/inquisitio/pcre_matcher.cc
+++ b/src/clients/inquisitio/pcre_matcher.cc
@@ -19,6 +19,7 @@
#include "pcre_matcher.hh"
#include <pcre++.h>
+#include <paludis/util/private_implementation_pattern-impl.hh>
using namespace paludis;
using namespace inquisitio;
diff --git a/src/clients/inquisitio/text_matcher.cc b/src/clients/inquisitio/text_matcher.cc
index dd096fcfe..238434ad3 100644
--- a/src/clients/inquisitio/text_matcher.cc
+++ b/src/clients/inquisitio/text_matcher.cc
@@ -18,6 +18,7 @@
*/
#include "text_matcher.hh"
+#include <paludis/util/private_implementation_pattern-impl.hh>
#include <string.h>
using namespace paludis;
diff --git a/src/clients/paludis/command_line.cc b/src/clients/paludis/command_line.cc
index ff59a9f56..8a1da5876 100644
--- a/src/clients/paludis/command_line.cc
+++ b/src/clients/paludis/command_line.cc
@@ -18,9 +18,12 @@
*/
#include "command_line.hh"
+#include <paludis/util/instantiation_policy-impl.hh>
using namespace paludis;
+template class paludis::InstantiationPolicy<CommandLine, paludis::instantiation_method::SingletonTag>;
+
CommandLine::CommandLine() :
ArgsHandler(),
diff --git a/src/clients/qualudis/qualudis_command_line.cc b/src/clients/qualudis/qualudis_command_line.cc
index b5f2a0c27..7ef07aa14 100644
--- a/src/clients/qualudis/qualudis_command_line.cc
+++ b/src/clients/qualudis/qualudis_command_line.cc
@@ -18,6 +18,9 @@
*/
#include "qualudis_command_line.hh"
+#include <paludis/util/instantiation_policy-impl.hh>
+
+template class paludis::InstantiationPolicy<QualudisCommandLine, paludis::instantiation_method::SingletonTag>;
QualudisCommandLine::QualudisCommandLine() :
ArgsHandler(),
diff --git a/src/common_args/deps_option_arg.cc b/src/common_args/deps_option_arg.cc
index 573eb4493..044411300 100644
--- a/src/common_args/deps_option_arg.cc
+++ b/src/common_args/deps_option_arg.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaranm@ciaranm.org>
*
* 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
@@ -19,6 +19,7 @@
#include "deps_option_arg.hh"
#include "do_help.hh"
+#include <paludis/util/stringify.hh>
using namespace paludis;
using namespace paludis::args;
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index bc3a51c09..485fb0510 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -24,6 +24,7 @@
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/visitor-impl.hh>
+#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/query.hh>
#include <list>