aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e
diff options
context:
space:
mode:
authorAvatar Elias Pipping <pipping@exherbo.org> 2011-08-07 03:35:05 +0200
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-08-07 18:18:38 +0100
commit0d9560ed1d5bfcb57752a0f4e66c74eef64188f4 (patch)
tree5789db7a2e875e7249a29ba9fc16e9bd6851287b /paludis/repositories/e
parentf4136ef1d6b8bcb2bf1ce5c0a418b29961dc7948 (diff)
downloadpaludis-0d9560ed1d5bfcb57752a0f4e66c74eef64188f4.tar.gz
paludis-0d9560ed1d5bfcb57752a0f4e66c74eef64188f4.tar.xz
Move explicit instantiations to namespace paludis
Makes clang++ happy
Diffstat (limited to 'paludis/repositories/e')
-rw-r--r--paludis/repositories/e/aa_visitor.cc6
-rw-r--r--paludis/repositories/e/e_choices_key.cc6
-rw-r--r--paludis/repositories/e/e_repository_news.cc10
-rw-r--r--paludis/repositories/e/e_repository_params.cc7
-rw-r--r--paludis/repositories/e/eapi.cc6
-rw-r--r--paludis/repositories/e/eapi_phase.cc9
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc6
-rw-r--r--paludis/repositories/e/extra_distribution_data.cc8
-rw-r--r--paludis/repositories/e/file_suffixes.cc6
-rw-r--r--paludis/repositories/e/glsa.cc10
-rw-r--r--paludis/repositories/e/info_metadata_key.cc8
-rw-r--r--paludis/repositories/e/layout.cc10
-rw-r--r--paludis/repositories/e/manifest2_reader.cc6
-rw-r--r--paludis/repositories/e/mask_info.cc8
-rw-r--r--paludis/repositories/e/memoised_hashes.cc8
-rw-r--r--paludis/repositories/e/metadata_xml.cc10
-rw-r--r--paludis/repositories/e/myoptions_requirements_verifier.cc6
-rw-r--r--paludis/repositories/e/profile.cc6
-rw-r--r--paludis/repositories/e/required_use_verifier.cc6
-rw-r--r--paludis/repositories/e/source_uri_finder.cc6
-rw-r--r--paludis/repositories/e/traditional_mask_file.cc8
-rw-r--r--paludis/repositories/e/traditional_profile_file.cc21
-rw-r--r--paludis/repositories/e/use_desc.cc5
-rw-r--r--paludis/repositories/e/xml_things_handle.cc8
24 files changed, 121 insertions, 69 deletions
diff --git a/paludis/repositories/e/aa_visitor.cc b/paludis/repositories/e/aa_visitor.cc
index 14f5b168d..5b58057f6 100644
--- a/paludis/repositories/e/aa_visitor.cc
+++ b/paludis/repositories/e/aa_visitor.cc
@@ -89,5 +89,7 @@ AAVisitor::end() const
return ConstIterator(_imp->aa.end());
}
-template class WrappedForwardIterator<AAVisitor::ConstIteratorTag, const std::string>;
-
+namespace paludis
+{
+ template class WrappedForwardIterator<AAVisitor::ConstIteratorTag, const std::string>;
+}
diff --git a/paludis/repositories/e/e_choices_key.cc b/paludis/repositories/e/e_choices_key.cc
index 54c70ff58..c02f5542a 100644
--- a/paludis/repositories/e/e_choices_key.cc
+++ b/paludis/repositories/e/e_choices_key.cc
@@ -602,5 +602,7 @@ EChoicesKey::type() const
return _imp->type;
}
-template class Map<ChoiceNameWithPrefix, std::string>;
-
+namespace paludis
+{
+ template class Map<ChoiceNameWithPrefix, std::string>;
+}
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index 138a16936..193419cbd 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -396,7 +396,9 @@ NewsError::NewsError(const FSPath & f, const std::string & m) throw () :
{
}
-template class WrappedForwardIterator<NewsFile::DisplayIfInstalledConstIteratorTag, const std::string>;
-template class WrappedForwardIterator<NewsFile::DisplayIfKeywordConstIteratorTag, const std::string>;
-template class WrappedForwardIterator<NewsFile::DisplayIfProfileConstIteratorTag, const std::string>;
-
+namespace paludis
+{
+ template class WrappedForwardIterator<NewsFile::DisplayIfInstalledConstIteratorTag, const std::string>;
+ template class WrappedForwardIterator<NewsFile::DisplayIfKeywordConstIteratorTag, const std::string>;
+ template class WrappedForwardIterator<NewsFile::DisplayIfProfileConstIteratorTag, const std::string>;
+}
diff --git a/paludis/repositories/e/e_repository_params.cc b/paludis/repositories/e/e_repository_params.cc
index 8c9c56d2b..67fc006c4 100644
--- a/paludis/repositories/e/e_repository_params.cc
+++ b/paludis/repositories/e/e_repository_params.cc
@@ -31,5 +31,8 @@ using namespace paludis::erepository;
#include <paludis/repositories/e/e_repository_params-se.cc>
-template class Sequence<std::shared_ptr<const ERepository> >;
-template class WrappedForwardIterator<Sequence<std::shared_ptr<const ERepository> >::ConstIteratorTag, const std::shared_ptr<const ERepository> >;
+namespace paludis
+{
+ template class Sequence<std::shared_ptr<const ERepository> >;
+ template class WrappedForwardIterator<Sequence<std::shared_ptr<const ERepository> >::ConstIteratorTag, const std::shared_ptr<const ERepository> >;
+}
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index c88d188ab..1463f1259 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -47,8 +47,6 @@
using namespace paludis;
using namespace paludis::erepository;
-template class Singleton<EAPIData>;
-
namespace
{
std::string predefined(const std::string & d, const KeyValueConfigFile &, const std::string & v)
@@ -489,3 +487,7 @@ EAPILabels::class_for_label(const std::string & l) const
return i->second;
}
+namespace paludis
+{
+ template class Singleton<EAPIData>;
+}
diff --git a/paludis/repositories/e/eapi_phase.cc b/paludis/repositories/e/eapi_phase.cc
index be8ba8c0e..5296da545 100644
--- a/paludis/repositories/e/eapi_phase.cc
+++ b/paludis/repositories/e/eapi_phase.cc
@@ -138,7 +138,8 @@ EAPIPhases::end_phases() const
return ConstIterator(indirect_iterator(_imp->phases.end()));
}
-template class WrappedForwardIterator<EAPIPhase::ConstIteratorTag, const std::string>;
-template class WrappedForwardIterator<EAPIPhases::ConstIteratorTag, const EAPIPhase>;
-
-
+namespace paludis
+{
+ template class WrappedForwardIterator<EAPIPhase::ConstIteratorTag, const std::string>;
+ template class WrappedForwardIterator<EAPIPhases::ConstIteratorTag, const EAPIPhase>;
+}
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
index e04299219..19204ad4c 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
@@ -912,5 +912,7 @@ EbuildFlatMetadataCache::save(const std::shared_ptr<const EbuildID> & id)
}
}
-template class Pimp<EbuildFlatMetadataCache>;
-
+namespace paludis
+{
+ template class Pimp<EbuildFlatMetadataCache>;
+}
diff --git a/paludis/repositories/e/extra_distribution_data.cc b/paludis/repositories/e/extra_distribution_data.cc
index 283310cc5..304d1e671 100644
--- a/paludis/repositories/e/extra_distribution_data.cc
+++ b/paludis/repositories/e/extra_distribution_data.cc
@@ -65,6 +65,8 @@ namespace paludis
};
}
-template class ExtraDistributionData<EDistribution>;
-template class Singleton<ExtraDistributionData<EDistribution>>;
-
+namespace paludis
+{
+ template class ExtraDistributionData<EDistribution>;
+ template class Singleton<ExtraDistributionData<EDistribution>>;
+}
diff --git a/paludis/repositories/e/file_suffixes.cc b/paludis/repositories/e/file_suffixes.cc
index 8a1be8b4a..a00a7ec3b 100644
--- a/paludis/repositories/e/file_suffixes.cc
+++ b/paludis/repositories/e/file_suffixes.cc
@@ -122,5 +122,7 @@ FileSuffixes::get_package_file_manifest_key(const FSPath & e, const QualifiedPac
return manifest_key(suffix);
}
-template class Singleton<FileSuffixes>;
-
+namespace paludis
+{
+ template class Singleton<FileSuffixes>;
+}
diff --git a/paludis/repositories/e/glsa.cc b/paludis/repositories/e/glsa.cc
index 2ad88d8a0..c9a883c05 100644
--- a/paludis/repositories/e/glsa.cc
+++ b/paludis/repositories/e/glsa.cc
@@ -219,7 +219,9 @@ GLSAError::GLSAError(const std::string & msg, const std::string & filename) thro
{
}
-template class WrappedForwardIterator<GLSAPackage::ArchsConstIteratorTag, const std::string>;
-template class WrappedForwardIterator<GLSAPackage::RangesConstIteratorTag, const erepository::GLSARange>;
-template class WrappedForwardIterator<GLSA::PackagesConstIteratorTag, const GLSAPackage>;
-
+namespace paludis
+{
+ template class WrappedForwardIterator<GLSAPackage::ArchsConstIteratorTag, const std::string>;
+ template class WrappedForwardIterator<GLSAPackage::RangesConstIteratorTag, const erepository::GLSARange>;
+ template class WrappedForwardIterator<GLSA::PackagesConstIteratorTag, const GLSAPackage>;
+}
diff --git a/paludis/repositories/e/info_metadata_key.cc b/paludis/repositories/e/info_metadata_key.cc
index 2776f51a6..6b1be734f 100644
--- a/paludis/repositories/e/info_metadata_key.cc
+++ b/paludis/repositories/e/info_metadata_key.cc
@@ -238,6 +238,8 @@ InfoPkgsMetadataKey::type() const
}
-template class Pimp<InfoPkgsMetadataKey>;
-template class Pimp<InfoVarsMetadataKey>;
-
+namespace paludis
+{
+ template class Pimp<InfoPkgsMetadataKey>;
+ template class Pimp<InfoVarsMetadataKey>;
+}
diff --git a/paludis/repositories/e/layout.cc b/paludis/repositories/e/layout.cc
index 57a59d335..d53e08a08 100644
--- a/paludis/repositories/e/layout.cc
+++ b/paludis/repositories/e/layout.cc
@@ -29,8 +29,6 @@
using namespace paludis;
using namespace paludis::erepository;
-template class Singleton<LayoutFactory>;
-
Layout::Layout(const std::shared_ptr<const FSPathSequence> & l) :
_master_repositories_locations(l)
{
@@ -82,6 +80,10 @@ LayoutFactory::create(
throw ConfigurationError("Unrecognised layout '" + s + "'");
}
-template class Map<FSPath, std::string, FSPathComparator>;
-template class WrappedForwardIterator<Map<FSPath, std::string, FSPathComparator>::ConstIteratorTag, const std::pair<const FSPath, std::string> >;
+namespace paludis
+{
+ template class Singleton<LayoutFactory>;
+ template class Map<FSPath, std::string, FSPathComparator>;
+ template class WrappedForwardIterator<Map<FSPath, std::string, FSPathComparator>::ConstIteratorTag, const std::pair<const FSPath, std::string> >;
+}
diff --git a/paludis/repositories/e/manifest2_reader.cc b/paludis/repositories/e/manifest2_reader.cc
index 8ee4ccb7e..b16ea6a68 100644
--- a/paludis/repositories/e/manifest2_reader.cc
+++ b/paludis/repositories/e/manifest2_reader.cc
@@ -167,5 +167,7 @@ Manifest2Reader::find(const std::pair<const std::string, const std::string> & p)
return ConstIterator(second_iterator(_imp->entries.find(p)));
}
-template class WrappedForwardIterator<Manifest2Reader::ConstIteratorTag, const Manifest2Entry>;
-
+namespace paludis
+{
+ template class WrappedForwardIterator<Manifest2Reader::ConstIteratorTag, const Manifest2Entry>;
+}
diff --git a/paludis/repositories/e/mask_info.cc b/paludis/repositories/e/mask_info.cc
index 39b03a134..71e336339 100644
--- a/paludis/repositories/e/mask_info.cc
+++ b/paludis/repositories/e/mask_info.cc
@@ -24,6 +24,8 @@
using namespace paludis;
using namespace paludis::erepository;
-template class Sequence<MaskInfo>;
-template class WrappedForwardIterator<Sequence<MaskInfo>::ConstIteratorTag, const MaskInfo>;
-
+namespace paludis
+{
+ template class Sequence<MaskInfo>;
+ template class WrappedForwardIterator<Sequence<MaskInfo>::ConstIteratorTag, const MaskInfo>;
+}
diff --git a/paludis/repositories/e/memoised_hashes.cc b/paludis/repositories/e/memoised_hashes.cc
index b5e422fae..a7215c52f 100644
--- a/paludis/repositories/e/memoised_hashes.cc
+++ b/paludis/repositories/e/memoised_hashes.cc
@@ -127,6 +127,8 @@ template const std::string MemoisedHashes::get<SHA1>(const FSPath &, SafeIFStrea
template const std::string MemoisedHashes::get<SHA256>(const FSPath &, SafeIFStream &) const;
template const std::string MemoisedHashes::get<MD5>(const FSPath &, SafeIFStream &) const;
-template class Pimp<MemoisedHashes>;
-template class Singleton<MemoisedHashes>;
-
+namespace paludis
+{
+ template class Pimp<MemoisedHashes>;
+ template class Singleton<MemoisedHashes>;
+}
diff --git a/paludis/repositories/e/metadata_xml.cc b/paludis/repositories/e/metadata_xml.cc
index 4ce704256..7e12e186c 100644
--- a/paludis/repositories/e/metadata_xml.cc
+++ b/paludis/repositories/e/metadata_xml.cc
@@ -85,7 +85,9 @@ MetadataXMLPool::metadata_if_exists(const FSPath & f) const
}
}
-template class Map<ChoiceNameWithPrefix, std::string>;
-template class Pimp<MetadataXMLPool>;
-template class Singleton<MetadataXMLPool>;
-
+namespace paludis
+{
+ template class Map<ChoiceNameWithPrefix, std::string>;
+ template class Pimp<MetadataXMLPool>;
+ template class Singleton<MetadataXMLPool>;
+}
diff --git a/paludis/repositories/e/myoptions_requirements_verifier.cc b/paludis/repositories/e/myoptions_requirements_verifier.cc
index 50e3f9236..542bd1f4d 100644
--- a/paludis/repositories/e/myoptions_requirements_verifier.cc
+++ b/paludis/repositories/e/myoptions_requirements_verifier.cc
@@ -359,5 +359,7 @@ MyOptionsRequirementsVerifier::visit(const PlainTextSpecTree::NodeType<AllDepSpe
_imp->current_prefix_stack.pop_front();
}
-template class Pimp<MyOptionsRequirementsVerifier>;
-
+namespace paludis
+{
+ template class Pimp<MyOptionsRequirementsVerifier>;
+}
diff --git a/paludis/repositories/e/profile.cc b/paludis/repositories/e/profile.cc
index c6fc7591c..a80945aa5 100644
--- a/paludis/repositories/e/profile.cc
+++ b/paludis/repositories/e/profile.cc
@@ -58,5 +58,7 @@ ProfileFactory::create(
throw ConfigurationError("Unrecognised profile '" + format + "'");
}
-template class Singleton<ProfileFactory>;
-
+namespace paludis
+{
+ template class Singleton<ProfileFactory>;
+}
diff --git a/paludis/repositories/e/required_use_verifier.cc b/paludis/repositories/e/required_use_verifier.cc
index b965a06b0..593881cd3 100644
--- a/paludis/repositories/e/required_use_verifier.cc
+++ b/paludis/repositories/e/required_use_verifier.cc
@@ -199,5 +199,7 @@ RequiredUseVerifier::unmet_requirements() const
return _imp->unmet_requirements;
}
-template class Pimp<RequiredUseVerifier>;
-
+namespace paludis
+{
+ template class Pimp<RequiredUseVerifier>;
+}
diff --git a/paludis/repositories/e/source_uri_finder.cc b/paludis/repositories/e/source_uri_finder.cc
index ea93f7e5f..7dfc568b8 100644
--- a/paludis/repositories/e/source_uri_finder.cc
+++ b/paludis/repositories/e/source_uri_finder.cc
@@ -230,5 +230,7 @@ SourceURIFinder::add_listed()
}
}
-template class WrappedForwardIterator<SourceURIFinder::ConstIteratorTag, const std::pair<std::string, std::string> >;
-
+namespace paludis
+{
+ template class WrappedForwardIterator<SourceURIFinder::ConstIteratorTag, const std::pair<std::string, std::string> >;
+}
diff --git a/paludis/repositories/e/traditional_mask_file.cc b/paludis/repositories/e/traditional_mask_file.cc
index 9161c5392..7c8e269b0 100644
--- a/paludis/repositories/e/traditional_mask_file.cc
+++ b/paludis/repositories/e/traditional_mask_file.cc
@@ -137,6 +137,8 @@ TraditionalMaskFile::~TraditionalMaskFile()
{
}
-template class WrappedForwardIterator<TraditionalMaskFile::ConstIteratorTag,
- const std::pair<const std::string, std::shared_ptr<const MaskInfo> > >;
-
+namespace paludis
+{
+ template class WrappedForwardIterator<TraditionalMaskFile::ConstIteratorTag,
+ const std::pair<const std::string, std::shared_ptr<const MaskInfo> > >;
+}
diff --git a/paludis/repositories/e/traditional_profile_file.cc b/paludis/repositories/e/traditional_profile_file.cc
index a0b9ada83..42d0207aa 100644
--- a/paludis/repositories/e/traditional_profile_file.cc
+++ b/paludis/repositories/e/traditional_profile_file.cc
@@ -205,13 +205,18 @@ TraditionalProfileFile<F_>::end() const
return ConstIterator(this->_imp->lines.end());
}
-template class TraditionalProfileFile<LineConfigFile>;
-template class WrappedForwardIterator<TraditionalProfileFile<LineConfigFile>::ConstIteratorTag, const std::pair<
- std::shared_ptr<const EAPI>,
- const std::remove_reference<LineConfigFile::ConstIterator::value_type>::type> >;
+namespace paludis
+{
+ namespace erepository {
+ template class TraditionalProfileFile<LineConfigFile>;
+ template class TraditionalProfileFile<TraditionalMaskFile>;
+ }
-template class TraditionalProfileFile<TraditionalMaskFile>;
-template class WrappedForwardIterator<TraditionalProfileFile<TraditionalMaskFile>::ConstIteratorTag, const std::pair<
- std::shared_ptr<const EAPI>,
- const std::remove_reference<TraditionalMaskFile::ConstIterator::value_type>::type> >;
+ template class WrappedForwardIterator<TraditionalProfileFile<LineConfigFile>::ConstIteratorTag, const std::pair<
+ std::shared_ptr<const EAPI>,
+ const std::remove_reference<LineConfigFile::ConstIterator::value_type>::type> >;
+ template class WrappedForwardIterator<TraditionalProfileFile<TraditionalMaskFile>::ConstIteratorTag, const std::pair<
+ std::shared_ptr<const EAPI>,
+ const std::remove_reference<TraditionalMaskFile::ConstIterator::value_type>::type> >;
+}
diff --git a/paludis/repositories/e/use_desc.cc b/paludis/repositories/e/use_desc.cc
index 1a2a9ae76..d5f919cd1 100644
--- a/paludis/repositories/e/use_desc.cc
+++ b/paludis/repositories/e/use_desc.cc
@@ -36,7 +36,6 @@
using namespace paludis;
-template class Sequence<UseDescFileInfo>;
typedef std::unordered_map<std::pair<ChoicePrefixName, UnprefixedChoiceName>, std::string,
Hash<std::pair<ChoicePrefixName, UnprefixedChoiceName> > > UseDescs;
@@ -110,3 +109,7 @@ UseDesc::describe(
return "";
}
+namespace paludis
+{
+ template class Sequence<UseDescFileInfo>;
+}
diff --git a/paludis/repositories/e/xml_things_handle.cc b/paludis/repositories/e/xml_things_handle.cc
index 158026c70..983495a93 100644
--- a/paludis/repositories/e/xml_things_handle.cc
+++ b/paludis/repositories/e/xml_things_handle.cc
@@ -154,6 +154,8 @@ XMLThingsHandle::create_metadata_xml_from_xml_file() const
return _imp->create_metadata_xml_from_xml_file;
}
-template class Pimp<XMLThingsHandle>;
-template class Singleton<XMLThingsHandle>;
-
+namespace paludis
+{
+ template class Pimp<XMLThingsHandle>;
+ template class Singleton<XMLThingsHandle>;
+}