aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Arthur Nascimento <tureba@gmail.com> 2018-07-07 23:18:56 -0300
committerAvatar Marvin Schmidt <marvin.schmidt1987@gmail.com> 2021-12-08 11:42:54 +0000
commitbabfb85b2412558688af76e10d9cab5d93975799 (patch)
treeb9b7f4f0dda57a9a13a10ba65abf9de86c95a730
parent15fd7f33b8c955d6114feec6155cb839156c5d88 (diff)
downloadpaludis-babfb85b2412558688af76e10d9cab5d93975799.tar.gz
paludis-babfb85b2412558688af76e10d9cab5d93975799.tar.xz
fix ignored attribute on types already defined
It seems these attributes have always been ignored silently but recent gcc versions started to warn about it. So removing these is safe. Example warning generated by recent gcc versions: [...]/paludis/util/digest_registry.cc:85:36: warning: type attributes ignored after type is already defined [-Wattributes] template class PALUDIS_VISIBLE WrappedForwardIterator<DigestRegistry::AlgorithmsConstIteratorTag,const std::pair<const std::string, DigestRegistry::Function> >; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-rw-r--r--paludis/args/args_handler.cc18
-rw-r--r--paludis/broken_linkage_finder.cc6
-rw-r--r--paludis/dep_spec.cc4
-rw-r--r--paludis/environment.hh4
-rw-r--r--paludis/util/digest_registry.cc2
5 files changed, 17 insertions, 17 deletions
diff --git a/paludis/args/args_handler.cc b/paludis/args/args_handler.cc
index 9ce263118..6481bf16f 100644
--- a/paludis/args/args_handler.cc
+++ b/paludis/args/args_handler.cc
@@ -481,13 +481,13 @@ ArgsHandler::separate_after_dashes_args() const
namespace paludis
{
- template class PALUDIS_VISIBLE WrappedForwardIterator<ArgsHandler::ParametersConstIteratorTag, const std::string>;
- template class PALUDIS_VISIBLE WrappedForwardIterator<ArgsHandler::UsageLineConstIteratorTag, const std::string>;
- template class PALUDIS_VISIBLE WrappedForwardIterator<ArgsHandler::EnvironmentLineConstIteratorTag, const std::pair<std::string, std::string>>;
- template class PALUDIS_VISIBLE WrappedForwardIterator<ArgsHandler::ExamplesConstIteratorTag, const std::pair<std::string, std::string>>;
- template class PALUDIS_VISIBLE WrappedForwardIterator<ArgsHandler::ArgsSectionsConstIteratorTag, const ArgsSection>;
- template class PALUDIS_VISIBLE WrappedForwardIterator<ArgsHandler::NotesIteratorTag, const std::string>;
- template class PALUDIS_VISIBLE WrappedForwardIterator<ArgsHandler::DescriptionLineConstIteratorTag, const std::string>;
- template class PALUDIS_VISIBLE WrappedForwardIterator<ArgsHandler::ArgsIteratorTag, std::string>;
- template class PALUDIS_VISIBLE WrappedForwardIterator<ArgsHandler::SeeAlsoConstIteratorTag, const std::pair<std::string, int> >;
+ 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::ArgsSectionsConstIteratorTag, const ArgsSection>;
+ template class WrappedForwardIterator<ArgsHandler::NotesIteratorTag, const std::string>;
+ template class WrappedForwardIterator<ArgsHandler::DescriptionLineConstIteratorTag, const std::string>;
+ template class WrappedForwardIterator<ArgsHandler::ArgsIteratorTag, std::string>;
+ template class WrappedForwardIterator<ArgsHandler::SeeAlsoConstIteratorTag, const std::pair<std::string, int> >;
}
diff --git a/paludis/broken_linkage_finder.cc b/paludis/broken_linkage_finder.cc
index e38bf5a15..6d74795c1 100644
--- a/paludis/broken_linkage_finder.cc
+++ b/paludis/broken_linkage_finder.cc
@@ -457,7 +457,7 @@ BrokenLinkageFinder::missing_requirements(const std::shared_ptr<const PackageID>
namespace paludis
{
- 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>;
+ 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>;
}
diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc
index e603fc443..be23463bb 100644
--- a/paludis/dep_spec.cc
+++ b/paludis/dep_spec.cc
@@ -652,6 +652,6 @@ namespace paludis
template class Pimp<URILabelsDepSpec>;
template class Pimp<DependenciesLabelsDepSpec>;
- 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>>;
+ template class WrappedForwardIterator<DependenciesLabelsDepSpec::ConstIteratorTag, const std::shared_ptr<const DependenciesLabel>>;
+ template class WrappedForwardIterator<URILabelsDepSpec::ConstIteratorTag, const std::shared_ptr<const URILabel>>;
}
diff --git a/paludis/environment.hh b/paludis/environment.hh
index 60e906f8b..df44d3eb5 100644
--- a/paludis/environment.hh
+++ b/paludis/environment.hh
@@ -722,8 +722,8 @@ namespace paludis
extern template class Pimp<CreateOutputManagerForRepositorySyncInfo>;
extern template class Pimp<CreateOutputManagerForPackageIDActionInfo>;
- extern template class PALUDIS_VISIBLE WrappedForwardIterator<Environment::RepositoryConstIteratorTag, const std::shared_ptr<Repository> >;
- extern template class PALUDIS_VISIBLE WrappedForwardIterator<AmbiguousPackageNameError::OptionsConstIteratorTag, const std::string>;
+ extern template class WrappedForwardIterator<Environment::RepositoryConstIteratorTag, const std::shared_ptr<Repository> >;
+ extern template class WrappedForwardIterator<AmbiguousPackageNameError::OptionsConstIteratorTag, const std::string>;
}
#endif
diff --git a/paludis/util/digest_registry.cc b/paludis/util/digest_registry.cc
index 4abce1d19..906959519 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 PALUDIS_VISIBLE WrappedForwardIterator<DigestRegistry::AlgorithmsConstIteratorTag, const std::pair<const std::string, DigestRegistry::Function> >;
+ template class WrappedForwardIterator<DigestRegistry::AlgorithmsConstIteratorTag, const std::pair<const std::string, DigestRegistry::Function> >;
}