paludis: mark visibility on a few extern templates

Give the explicit template specializations default visibility.  This is needed
to build the cave client with clang with hidden visibility.

5 files changed, 12 insertions, 20 deletions

diff --git a/paludis/args/args_handler.cc b/paludis/args/args_handler.cc
index 9e973529e..6481bf16f 100644
--- a/paludis/args/args_handler.cc
+++ b/paludis/args/args_handler.cc
@@ -483,10 +483,8 @@ namespace paludis
 {
     template class WrappedForwardIterator<ArgsHandler::ParametersConstIteratorTag, const std::string>;
     template class WrappedForwardIterator<ArgsHandler::UsageLineConstIteratorTag, const std::string>;
-    template class WrappedForwardIterator<ArgsHandler::EnvironmentLineConstIteratorTag,
-             const std::pair<std::string, std::string> >;
-    template class WrappedForwardIterator<ArgsHandler::ExamplesConstIteratorTag,
-             const std::pair<std::string, std::string> >;
+    template class WrappedForwardIterator<ArgsHandler::EnvironmentLineConstIteratorTag, const std::pair<std::string, std::string>>;
+    template class WrappedForwardIterator<ArgsHandler::ExamplesConstIteratorTag, const std::pair<std::string, std::string>>;
     template class WrappedForwardIterator<ArgsHandler::ArgsSectionsConstIteratorTag, const ArgsSection>;
     template class WrappedForwardIterator<ArgsHandler::NotesIteratorTag, const std::string>;
     template class WrappedForwardIterator<ArgsHandler::DescriptionLineConstIteratorTag, const std::string>;
diff --git a/paludis/args/args_handler.hh b/paludis/args/args_handler.hh
index bfe3a77a7..e8208cb4a 100644
--- a/paludis/args/args_handler.hh
+++ b/paludis/args/args_handler.hh
@@ -354,10 +354,8 @@ namespace paludis
 
     extern template class PALUDIS_VISIBLE WrappedForwardIterator<args::ArgsHandler::ParametersConstIteratorTag, const std::string>;
     extern template class PALUDIS_VISIBLE WrappedForwardIterator<args::ArgsHandler::UsageLineConstIteratorTag, const std::string>;
-    extern template class PALUDIS_VISIBLE WrappedForwardIterator<args::ArgsHandler::EnvironmentLineConstIteratorTag,
-            const std::pair<std::string, std::string> >;
-    extern template class PALUDIS_VISIBLE WrappedForwardIterator<args::ArgsHandler::ExamplesConstIteratorTag,
-            const std::pair<std::string, std::string> >;
+    extern template class PALUDIS_VISIBLE WrappedForwardIterator<args::ArgsHandler::EnvironmentLineConstIteratorTag, const std::pair<std::string, std::string>>;
+    extern template class PALUDIS_VISIBLE WrappedForwardIterator<args::ArgsHandler::ExamplesConstIteratorTag, const std::pair<std::string, std::string>>;
     extern template class PALUDIS_VISIBLE WrappedForwardIterator<args::ArgsHandler::ArgsSectionsConstIteratorTag, const args::ArgsSection>;
     extern template class PALUDIS_VISIBLE WrappedForwardIterator<args::ArgsHandler::DescriptionLineConstIteratorTag, const std::string>;
     extern template class PALUDIS_VISIBLE WrappedForwardIterator<args::ArgsHandler::NotesIteratorTag, const std::string>;
diff --git a/paludis/broken_linkage_finder.cc b/paludis/broken_linkage_finder.cc
index fbe8623db..b39746f62 100644
--- a/paludis/broken_linkage_finder.cc
+++ b/paludis/broken_linkage_finder.cc
@@ -443,9 +443,7 @@ BrokenLinkageFinder::end_missing_requirements(
 
 namespace paludis
 {
-    template class WrappedForwardIterator<BrokenLinkageFinder::BrokenPackageConstIteratorTag,
-             const std::shared_ptr<const PackageID> >;
-    template class WrappedForwardIterator<BrokenLinkageFinder::BrokenFileConstIteratorTag,
-             const FSPath>;
-    template class WrappedForwardIterator<BrokenLinkageFinder::MissingRequirementConstIteratorTag, const std::string>;
+    template class PALUDIS_VISIBLE WrappedForwardIterator<BrokenLinkageFinder::BrokenPackageConstIteratorTag, const std::shared_ptr<const PackageID>>;
+    template class PALUDIS_VISIBLE WrappedForwardIterator<BrokenLinkageFinder::BrokenFileConstIteratorTag, const FSPath>;
+    template class PALUDIS_VISIBLE WrappedForwardIterator<BrokenLinkageFinder::MissingRequirementConstIteratorTag, const std::string>;
 }
diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc
index 8cc369cb8..fc5c98139 100644
--- a/paludis/dep_spec.cc
+++ b/paludis/dep_spec.cc
@@ -641,8 +641,8 @@ PackageDepSpec::data() const
 
 namespace paludis
 {
-    template class LabelsDepSpec<URILabel>;
-    template class LabelsDepSpec<DependenciesLabel>;
+    template class PALUDIS_VISIBLE LabelsDepSpec<URILabel>;
+    template class PALUDIS_VISIBLE LabelsDepSpec<DependenciesLabel>;
 
     template class Cloneable<DepSpec>;
     template class Pimp<ConditionalDepSpec>;
@@ -652,8 +652,6 @@ namespace paludis
     template class Pimp<URILabelsDepSpec>;
     template class Pimp<DependenciesLabelsDepSpec>;
 
-    template class WrappedForwardIterator<DependenciesLabelsDepSpec::ConstIteratorTag,
-             const std::shared_ptr<const DependenciesLabel> >;
-    template class WrappedForwardIterator<URILabelsDepSpec::ConstIteratorTag,
-             const std::shared_ptr<const URILabel> >;
+    template class PALUDIS_VISIBLE WrappedForwardIterator<DependenciesLabelsDepSpec::ConstIteratorTag, const std::shared_ptr<const DependenciesLabel>>;
+    template class PALUDIS_VISIBLE WrappedForwardIterator<URILabelsDepSpec::ConstIteratorTag, const std::shared_ptr<const URILabel>>;
 }
diff --git a/paludis/util/digest_registry.cc b/paludis/util/digest_registry.cc
index 906959519..4abce1d19 100644
--- a/paludis/util/digest_registry.cc
+++ b/paludis/util/digest_registry.cc
@@ -82,7 +82,7 @@ namespace paludis
 {
     template class Pimp<DigestRegistry>;
     template class Singleton<DigestRegistry>;
-    template class WrappedForwardIterator<DigestRegistry::AlgorithmsConstIteratorTag, const std::pair<const std::string, DigestRegistry::Function> >;
+    template class PALUDIS_VISIBLE WrappedForwardIterator<DigestRegistry::AlgorithmsConstIteratorTag, const std::pair<const std::string, DigestRegistry::Function> >;
 }