aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-02-24 19:18:18 -0800
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-02-26 20:25:21 -0800
commitac8b624f587237bf4b468883cab73b0d99e074ea (patch)
tree10523c98791c2d0df47d3993f9eb52d46eaf8f8f
parent6bda8b8b0d4a872d68a814a055cc779e432d9a66 (diff)
downloadpaludis-ac8b624f587237bf4b468883cab73b0d99e074ea.tar.gz
paludis-ac8b624f587237bf4b468883cab73b0d99e074ea.tar.xz
fix tag mismatches
This is a mechanical change to address tag mismatches for forward declaration. This is not an error, however, the sheer number of these warnings caused by the extensive amount of forward declaration usage drowns out the errors. This has no functional change.
-rw-r--r--paludis/always_enabled_dependency_label-fwd.hh2
-rw-r--r--paludis/args/args_section.hh4
-rw-r--r--paludis/changed_choices-fwd.hh2
-rw-r--r--paludis/choice-fwd.hh2
-rw-r--r--paludis/command_output_manager-fwd.hh2
-rw-r--r--paludis/contents-fwd.hh12
-rw-r--r--paludis/dep_label-fwd.hh8
-rw-r--r--paludis/dep_spec_annotations-fwd.hh2
-rw-r--r--paludis/elike_choices-fwd.hh16
-rw-r--r--paludis/environment-fwd.hh6
-rw-r--r--paludis/environments/paludis/paludis_config.hh18
-rw-r--r--paludis/format_messages_output_manager-fwd.hh2
-rw-r--r--paludis/formatted_pretty_printer-fwd.hh2
-rw-r--r--paludis/fs_merger-fwd.hh2
-rw-r--r--paludis/hook-fwd.hh2
-rw-r--r--paludis/hooker.hh2
-rw-r--r--paludis/ipc_output_manager-fwd.hh6
-rw-r--r--paludis/name.cc72
-rw-r--r--paludis/name.hh18
-rw-r--r--paludis/notifier_callback-fwd.hh12
-rw-r--r--paludis/package_dep_spec_collection-fwd.hh2
-rw-r--r--paludis/paludislike_options_conf-fwd.hh2
-rw-r--r--paludis/repositories/accounts/accounts_repository_store.hh2
-rw-r--r--paludis/repositories/e/eapi-fwd.hh26
-rw-r--r--paludis/repositories/e/info_metadata_key.hh2
-rw-r--r--paludis/repositories/e/pipe_command_handler.hh2
-rw-r--r--paludis/repositories/e/traditional_mask_file.hh2
-rw-r--r--paludis/repositories/e/traditional_profile_file.hh2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.hh2
-rw-r--r--paludis/repositories/unwritten/unwritten_id.hh2
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_store.hh2
-rw-r--r--paludis/resolver/allow_choice_changes_helper-fwd.hh2
-rw-r--r--paludis/resolver/allowed_to_remove_helper-fwd.hh2
-rw-r--r--paludis/resolver/allowed_to_restart_helper-fwd.hh2
-rw-r--r--paludis/resolver/always_via_binary_helper-fwd.hh2
-rw-r--r--paludis/resolver/can_use_helper-fwd.hh2
-rw-r--r--paludis/resolver/confirm_helper-fwd.hh2
-rw-r--r--paludis/resolver/constraint-fwd.hh2
-rw-r--r--paludis/resolver/decider-fwd.hh2
-rw-r--r--paludis/resolver/decisions-fwd.hh2
-rw-r--r--paludis/resolver/find_replacing_helper-fwd.hh2
-rw-r--r--paludis/resolver/find_repository_for_helper-fwd.hh2
-rw-r--r--paludis/resolver/get_constraints_for_dependent_helper-fwd.hh2
-rw-r--r--paludis/resolver/get_constraints_for_purge_helper-fwd.hh2
-rw-r--r--paludis/resolver/get_constraints_for_via_binary_helper-fwd.hh2
-rw-r--r--paludis/resolver/get_destination_types_for_blocker_helper-fwd.hh2
-rw-r--r--paludis/resolver/get_destination_types_for_error_helper-fwd.hh2
-rw-r--r--paludis/resolver/get_initial_constraints_for_helper-fwd.hh2
-rw-r--r--paludis/resolver/get_resolvents_for_helper-fwd.hh2
-rw-r--r--paludis/resolver/get_use_existing_nothing_helper-fwd.hh2
-rw-r--r--paludis/resolver/interest_in_spec_helper-fwd.hh2
-rw-r--r--paludis/resolver/job_list-fwd.hh2
-rw-r--r--paludis/resolver/job_state-fwd.hh12
-rw-r--r--paludis/resolver/make_destination_filtered_generator_helper-fwd.hh2
-rw-r--r--paludis/resolver/make_origin_filtered_generator_helper-fwd.hh2
-rw-r--r--paludis/resolver/make_unmaskable_filter_helper-fwd.hh2
-rw-r--r--paludis/resolver/nag-fwd.hh2
-rw-r--r--paludis/resolver/order_early_helper-fwd.hh2
-rw-r--r--paludis/resolver/orderer-fwd.hh2
-rw-r--r--paludis/resolver/prefer_or_avoid_helper-fwd.hh2
-rw-r--r--paludis/resolver/reason-fwd.hh18
-rw-r--r--paludis/resolver/remove_if_dependent_helper-fwd.hh2
-rw-r--r--paludis/resolver/required_confirmations-fwd.hh14
-rw-r--r--paludis/resolver/resolutions_by_resolvent-fwd.hh2
-rw-r--r--paludis/resolver/resolver-fwd.hh2
-rw-r--r--paludis/resolver/sanitised_dependencies-fwd.hh2
-rw-r--r--paludis/resolver/suggest_restart-fwd.hh2
-rw-r--r--paludis/serialise-fwd.hh6
-rw-r--r--paludis/slot_requirement-fwd.hh14
-rw-r--r--paludis/spec_tree-fwd.hh2
-rw-r--r--paludis/spec_tree.hh2
-rw-r--r--paludis/stripper-fwd.hh2
-rw-r--r--paludis/user_dep_spec-fwd.hh6
-rw-r--r--paludis/util/active_object_ptr-fwd.hh2
-rw-r--r--paludis/util/buffer_output_stream-fwd.hh2
-rw-r--r--paludis/util/deferred_construction_ptr-fwd.hh2
-rw-r--r--paludis/util/elf_sections.hh4
-rw-r--r--paludis/util/enum_iterator-fwd.hh2
-rw-r--r--paludis/util/executor-fwd.hh4
-rw-r--r--paludis/util/fs_iterator-fwd.hh2
-rw-r--r--paludis/util/fs_path-fwd.hh4
-rw-r--r--paludis/util/fs_stat-fwd.hh2
-rw-r--r--paludis/util/indirect_iterator-fwd.hh2
-rw-r--r--paludis/util/map-fwd.hh2
-rw-r--r--paludis/util/map.cc2
-rw-r--r--paludis/util/named_value-fwd.hh2
-rw-r--r--paludis/util/process-fwd.hh8
-rw-r--r--paludis/util/sequence-fwd.hh8
-rw-r--r--paludis/util/set-fwd.hh2
-rw-r--r--paludis/util/simple_parser.cc2
-rw-r--r--paludis/util/simple_parser.hh2
-rw-r--r--paludis/util/string_list_stream-fwd.hh2
-rw-r--r--paludis/util/timestamp-fwd.hh2
-rw-r--r--paludis/util/tokeniser.hh2
-rw-r--r--paludis/util/tribool-fwd.hh2
-rw-r--r--paludis/util/visitor-fwd.hh18
-rw-r--r--paludis/util/visitor.hh5
-rw-r--r--paludis/util/wrapped_forward_iterator-fwd.hh2
-rw-r--r--paludis/util/wrapped_output_iterator-fwd.hh4
-rw-r--r--paludis/util/wrapped_value-fwd.hh2
-rw-r--r--paludis/version_requirements-fwd.hh2
101 files changed, 238 insertions, 237 deletions
diff --git a/paludis/always_enabled_dependency_label-fwd.hh b/paludis/always_enabled_dependency_label-fwd.hh
index 3c3f2afca..0a93163df 100644
--- a/paludis/always_enabled_dependency_label-fwd.hh
+++ b/paludis/always_enabled_dependency_label-fwd.hh
@@ -23,7 +23,7 @@
namespace paludis
{
template <typename Label_>
- struct AlwaysEnabledDependencyLabel;
+ class AlwaysEnabledDependencyLabel;
}
#endif
diff --git a/paludis/args/args_section.hh b/paludis/args/args_section.hh
index 5422575e4..3b811108c 100644
--- a/paludis/args/args_section.hh
+++ b/paludis/args/args_section.hh
@@ -29,8 +29,8 @@ namespace paludis
{
namespace args
{
- struct ArgsGroup;
- struct ArgsHandler;
+ class ArgsGroup;
+ class ArgsHandler;
/**
* Holds a number of ArgsGroup instances.
diff --git a/paludis/changed_choices-fwd.hh b/paludis/changed_choices-fwd.hh
index 71c551ae4..fa7ebf100 100644
--- a/paludis/changed_choices-fwd.hh
+++ b/paludis/changed_choices-fwd.hh
@@ -22,7 +22,7 @@
namespace paludis
{
- struct ChangedChoices;
+ class ChangedChoices;
}
#endif
diff --git a/paludis/choice-fwd.hh b/paludis/choice-fwd.hh
index 01b702a41..3eaf67979 100644
--- a/paludis/choice-fwd.hh
+++ b/paludis/choice-fwd.hh
@@ -38,7 +38,7 @@ namespace paludis
class Choice;
class ChoiceValue;
- class ChoiceParams;
+ struct ChoiceParams;
struct ChoicePrefixNameTag;
struct ChoiceNameWithPrefixTag;
diff --git a/paludis/command_output_manager-fwd.hh b/paludis/command_output_manager-fwd.hh
index 564b34bf1..a43bbd06f 100644
--- a/paludis/command_output_manager-fwd.hh
+++ b/paludis/command_output_manager-fwd.hh
@@ -22,7 +22,7 @@
namespace paludis
{
- struct CommandOutputManager;
+ class CommandOutputManager;
}
#endif
diff --git a/paludis/contents-fwd.hh b/paludis/contents-fwd.hh
index b3590d7c4..e2089f826 100644
--- a/paludis/contents-fwd.hh
+++ b/paludis/contents-fwd.hh
@@ -31,13 +31,13 @@
namespace paludis
{
- struct ContentsEntry;
- struct ContentsFileEntry;
- struct ContentsDirEntry;
- struct ContentsSymEntry;
- struct ContentsOtherEntry;
+ class ContentsEntry;
+ class ContentsFileEntry;
+ class ContentsDirEntry;
+ class ContentsSymEntry;
+ class ContentsOtherEntry;
- struct Contents;
+ class Contents;
}
#endif
diff --git a/paludis/dep_label-fwd.hh b/paludis/dep_label-fwd.hh
index bf1551e6c..f9ebceba1 100644
--- a/paludis/dep_label-fwd.hh
+++ b/paludis/dep_label-fwd.hh
@@ -33,9 +33,9 @@
namespace paludis
{
- struct URILabel;
+ class URILabel;
- template <typename T_> struct SpecificURILabel;
+ template <typename T_> class SpecificURILabel;
struct URIMirrorsThenListedLabelTag;
typedef SpecificURILabel<URIMirrorsThenListedLabelTag> URIMirrorsThenListedLabel;
@@ -63,10 +63,10 @@ namespace paludis
*/
std::ostream & operator<< (std::ostream &, const URILabel &) PALUDIS_VISIBLE;
- struct DependenciesLabel;
+ class DependenciesLabel;
template <typename>
- struct SpecificDependenciesLabel;
+ class SpecificDependenciesLabel;
/**
* Tag for DependenciesBuildLabel.
diff --git a/paludis/dep_spec_annotations-fwd.hh b/paludis/dep_spec_annotations-fwd.hh
index 2403ff625..7cd93e2c7 100644
--- a/paludis/dep_spec_annotations-fwd.hh
+++ b/paludis/dep_spec_annotations-fwd.hh
@@ -26,7 +26,7 @@
namespace paludis
{
- class DepSpecAnnotation;
+ struct DepSpecAnnotation;
class DepSpecAnnotations;
#include <paludis/dep_spec_annotations-se.hh>
diff --git a/paludis/elike_choices-fwd.hh b/paludis/elike_choices-fwd.hh
index f176d62a1..84a4b1666 100644
--- a/paludis/elike_choices-fwd.hh
+++ b/paludis/elike_choices-fwd.hh
@@ -28,14 +28,14 @@
namespace paludis
{
- struct ELikeOptionalTestsChoiceValue;
- struct ELikeRecommendedTestsChoiceValue;
- struct ELikeExpensiveTestsChoiceValue;
- struct ELikeJobsChoiceValue;
- struct ELikeTraceChoiceValue;
- struct ELikeSymbolsChoiceValue;
- struct ELikeWorkChoiceValue;
- struct ELikeDwarfCompressionChoiceValue;
+ class ELikeOptionalTestsChoiceValue;
+ class ELikeRecommendedTestsChoiceValue;
+ class ELikeExpensiveTestsChoiceValue;
+ class ELikeJobsChoiceValue;
+ class ELikeTraceChoiceValue;
+ class ELikeSymbolsChoiceValue;
+ class ELikeWorkChoiceValue;
+ class ELikeDwarfCompressionChoiceValue;
const ChoicePrefixName canonical_build_options_prefix() PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
const std::string canonical_build_options_raw_name() PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/environment-fwd.hh b/paludis/environment-fwd.hh
index 2b98d0653..001133005 100644
--- a/paludis/environment-fwd.hh
+++ b/paludis/environment-fwd.hh
@@ -42,9 +42,9 @@ namespace paludis
class Environment;
- struct CreateOutputManagerInfo;
- struct CreateOutputManagerForPackageIDActionInfo;
- struct CreateOutputManagerForRepositorySyncInfo;
+ class CreateOutputManagerInfo;
+ class CreateOutputManagerForPackageIDActionInfo;
+ class CreateOutputManagerForRepositorySyncInfo;
}
#endif
diff --git a/paludis/environments/paludis/paludis_config.hh b/paludis/environments/paludis/paludis_config.hh
index b88a7cb2b..815107f20 100644
--- a/paludis/environments/paludis/paludis_config.hh
+++ b/paludis/environments/paludis/paludis_config.hh
@@ -39,18 +39,18 @@
namespace paludis
{
- struct PaludisEnvironment;
+ class PaludisEnvironment;
namespace paludis_environment
{
- struct KeywordsConf;
- struct UseConf;
- struct LicensesConf;
- struct PackageMaskConf;
- struct MirrorsConf;
- struct OutputConf;
- struct World;
- struct SuggestionsConf;
+ class KeywordsConf;
+ class UseConf;
+ class LicensesConf;
+ class PackageMaskConf;
+ class MirrorsConf;
+ class OutputConf;
+ class World;
+ class SuggestionsConf;
/**
* A PaludisConfigError is thrown if a configuration error is encountered
diff --git a/paludis/format_messages_output_manager-fwd.hh b/paludis/format_messages_output_manager-fwd.hh
index e2509d73d..d49514043 100644
--- a/paludis/format_messages_output_manager-fwd.hh
+++ b/paludis/format_messages_output_manager-fwd.hh
@@ -22,7 +22,7 @@
namespace paludis
{
- struct FormatMessagesOutputManager;
+ class FormatMessagesOutputManager;
}
#endif
diff --git a/paludis/formatted_pretty_printer-fwd.hh b/paludis/formatted_pretty_printer-fwd.hh
index 85a6480ff..25007321c 100644
--- a/paludis/formatted_pretty_printer-fwd.hh
+++ b/paludis/formatted_pretty_printer-fwd.hh
@@ -22,7 +22,7 @@
namespace paludis
{
- struct FormattedPrettyPrinter;
+ class FormattedPrettyPrinter;
}
#endif
diff --git a/paludis/fs_merger-fwd.hh b/paludis/fs_merger-fwd.hh
index dff523319..9d1e60be5 100644
--- a/paludis/fs_merger-fwd.hh
+++ b/paludis/fs_merger-fwd.hh
@@ -52,7 +52,7 @@ namespace paludis
*/
typedef Options<FSMergerOption> FSMergerOptions;
- class FSMergerParams;
+ struct FSMergerParams;
class FSMergerError;
class FSMerger;
}
diff --git a/paludis/hook-fwd.hh b/paludis/hook-fwd.hh
index 498f180a4..2a3a3de3b 100644
--- a/paludis/hook-fwd.hh
+++ b/paludis/hook-fwd.hh
@@ -35,7 +35,7 @@ namespace paludis
#include <paludis/hook-se.hh>
- class HookResult;
+ struct HookResult;
class Hook;
}
diff --git a/paludis/hooker.hh b/paludis/hooker.hh
index 4b998cbe9..322e0abff 100644
--- a/paludis/hooker.hh
+++ b/paludis/hooker.hh
@@ -43,7 +43,7 @@ namespace paludis
{
class Environment;
class Hook;
- class HookResult;
+ struct HookResult;
/**
* A HookFile provides an abstraction of a hook file.
diff --git a/paludis/ipc_output_manager-fwd.hh b/paludis/ipc_output_manager-fwd.hh
index 328e449d9..742de525c 100644
--- a/paludis/ipc_output_manager-fwd.hh
+++ b/paludis/ipc_output_manager-fwd.hh
@@ -22,11 +22,11 @@
namespace paludis
{
- struct IPCOutputManager;
+ class IPCOutputManager;
- struct IPCInputManager;
+ class IPCInputManager;
- struct OutputManagerFromIPC;
+ class OutputManagerFromIPC;
}
#endif
diff --git a/paludis/name.cc b/paludis/name.cc
index 15de46ac7..ff53411d8 100644
--- a/paludis/name.cc
+++ b/paludis/name.cc
@@ -35,42 +35,42 @@ using namespace paludis;
namespace paludis
{
- template struct WrappedValue<RepositoryNameTag>;
- template struct WrappedValue<CategoryNamePartTag>;
- template struct WrappedValue<PackageNamePartTag>;
- template struct WrappedValue<SlotNameTag>;
- template struct WrappedValue<KeywordNameTag>;
- template struct WrappedValue<SetNameTag>;
-
- template struct PALUDIS_VISIBLE Sequence<RepositoryName>;
- template struct PALUDIS_VISIBLE WrappedForwardIterator<Sequence<RepositoryName>::ConstIteratorTag, const RepositoryName>;
-
- template struct PALUDIS_VISIBLE Set<RepositoryName>;
- template struct PALUDIS_VISIBLE WrappedForwardIterator<Set<RepositoryName>::ConstIteratorTag, const RepositoryName>;
- template struct PALUDIS_VISIBLE WrappedOutputIterator<Set<RepositoryName>::InserterTag, RepositoryName>;
-
- template struct PALUDIS_VISIBLE Set<PackageNamePart>;
- template struct PALUDIS_VISIBLE WrappedForwardIterator<Set<PackageNamePart>::ConstIteratorTag, const PackageNamePart>;
- template struct PALUDIS_VISIBLE WrappedOutputIterator<Set<PackageNamePart>::InserterTag, PackageNamePart>;
-
- template struct PALUDIS_VISIBLE Set<CategoryNamePart>;
- template struct PALUDIS_VISIBLE WrappedForwardIterator<Set<CategoryNamePart>::ConstIteratorTag, const CategoryNamePart>;
- template struct PALUDIS_VISIBLE WrappedOutputIterator<Set<CategoryNamePart>::InserterTag, CategoryNamePart>;
-
- template struct Set<QualifiedPackageName>;
- template struct WrappedForwardIterator<Set<QualifiedPackageName>::ConstIteratorTag, const QualifiedPackageName>;
- template struct WrappedOutputIterator<Set<QualifiedPackageName>::InserterTag, QualifiedPackageName>;
-
- template struct PALUDIS_VISIBLE Set<KeywordName>;
- template struct PALUDIS_VISIBLE WrappedForwardIterator<Set<KeywordName>::ConstIteratorTag, const KeywordName>;
- template struct PALUDIS_VISIBLE WrappedOutputIterator<Set<KeywordName>::InserterTag, KeywordName>;
-
- template struct PALUDIS_VISIBLE Set<SetName>;
- template struct PALUDIS_VISIBLE WrappedForwardIterator<Set<SetName>::ConstIteratorTag, const SetName>;
- template struct PALUDIS_VISIBLE WrappedOutputIterator<Set<SetName>::InserterTag, SetName>;
-
- template struct PALUDIS_VISIBLE WrappedForwardIterator<Set<std::string>::ConstIteratorTag, const std::string>;
- template struct PALUDIS_VISIBLE WrappedOutputIterator<Set<std::string>::InserterTag, std::string>;
+ template class WrappedValue<RepositoryNameTag>;
+ template class WrappedValue<CategoryNamePartTag>;
+ template class WrappedValue<PackageNamePartTag>;
+ template class WrappedValue<SlotNameTag>;
+ template class WrappedValue<KeywordNameTag>;
+ template class WrappedValue<SetNameTag>;
+
+ template class PALUDIS_VISIBLE Sequence<RepositoryName>;
+ template class PALUDIS_VISIBLE WrappedForwardIterator<Sequence<RepositoryName>::ConstIteratorTag, const RepositoryName>;
+
+ template class PALUDIS_VISIBLE Set<RepositoryName>;
+ template class PALUDIS_VISIBLE WrappedForwardIterator<Set<RepositoryName>::ConstIteratorTag, const RepositoryName>;
+ template class PALUDIS_VISIBLE WrappedOutputIterator<Set<RepositoryName>::InserterTag, RepositoryName>;
+
+ template class PALUDIS_VISIBLE Set<PackageNamePart>;
+ template class PALUDIS_VISIBLE WrappedForwardIterator<Set<PackageNamePart>::ConstIteratorTag, const PackageNamePart>;
+ template class PALUDIS_VISIBLE WrappedOutputIterator<Set<PackageNamePart>::InserterTag, PackageNamePart>;
+
+ template class PALUDIS_VISIBLE Set<CategoryNamePart>;
+ template class PALUDIS_VISIBLE WrappedForwardIterator<Set<CategoryNamePart>::ConstIteratorTag, const CategoryNamePart>;
+ template class PALUDIS_VISIBLE WrappedOutputIterator<Set<CategoryNamePart>::InserterTag, CategoryNamePart>;
+
+ template class Set<QualifiedPackageName>;
+ template class WrappedForwardIterator<Set<QualifiedPackageName>::ConstIteratorTag, const QualifiedPackageName>;
+ template class WrappedOutputIterator<Set<QualifiedPackageName>::InserterTag, QualifiedPackageName>;
+
+ template class PALUDIS_VISIBLE Set<KeywordName>;
+ template class PALUDIS_VISIBLE WrappedForwardIterator<Set<KeywordName>::ConstIteratorTag, const KeywordName>;
+ template class PALUDIS_VISIBLE WrappedOutputIterator<Set<KeywordName>::InserterTag, KeywordName>;
+
+ template class PALUDIS_VISIBLE Set<SetName>;
+ template class PALUDIS_VISIBLE WrappedForwardIterator<Set<SetName>::ConstIteratorTag, const SetName>;
+ template class PALUDIS_VISIBLE WrappedOutputIterator<Set<SetName>::InserterTag, SetName>;
+
+ template class PALUDIS_VISIBLE WrappedForwardIterator<Set<std::string>::ConstIteratorTag, const std::string>;
+ template class PALUDIS_VISIBLE WrappedOutputIterator<Set<std::string>::InserterTag, std::string>;
}
template PALUDIS_VISIBLE std::ostream & paludis::operator<< (std::ostream &, const WrappedValue<RepositoryNameTag> &);
diff --git a/paludis/name.hh b/paludis/name.hh
index b0f56c23c..cf48255b3 100644
--- a/paludis/name.hh
+++ b/paludis/name.hh
@@ -70,7 +70,7 @@ namespace paludis
static bool validate(const std::string &) PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template struct PALUDIS_VISIBLE WrappedValue<PackageNamePartTag>;
+ extern template class PALUDIS_VISIBLE WrappedValue<PackageNamePartTag>;
/**
* A CategoryNamePartError is thrown if an invalid value is assigned to
@@ -99,7 +99,7 @@ namespace paludis
static bool validate(const std::string &) PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template struct PALUDIS_VISIBLE WrappedValue<CategoryNamePartTag>;
+ extern template class PALUDIS_VISIBLE WrappedValue<CategoryNamePartTag>;
/**
* Represents a category plus package name.
@@ -244,14 +244,14 @@ namespace paludis
static bool validate(const std::string &) PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template struct PALUDIS_VISIBLE WrappedValue<RepositoryNameTag>;
- extern template struct PALUDIS_VISIBLE WrappedValue<SlotNameTag>;
- extern template struct PALUDIS_VISIBLE WrappedValue<KeywordNameTag>;
- extern template struct PALUDIS_VISIBLE WrappedValue<SetNameTag>;
+ extern template class PALUDIS_VISIBLE WrappedValue<RepositoryNameTag>;
+ extern template class PALUDIS_VISIBLE WrappedValue<SlotNameTag>;
+ extern template class PALUDIS_VISIBLE WrappedValue<KeywordNameTag>;
+ extern template class PALUDIS_VISIBLE WrappedValue<SetNameTag>;
- extern template struct PALUDIS_VISIBLE Set<QualifiedPackageName>;
- extern template struct PALUDIS_VISIBLE WrappedForwardIterator<Set<QualifiedPackageName>::ConstIteratorTag, const QualifiedPackageName>;
- extern template struct PALUDIS_VISIBLE WrappedOutputIterator<Set<QualifiedPackageName>::InserterTag, QualifiedPackageName>;
+ extern template class PALUDIS_VISIBLE Set<QualifiedPackageName>;
+ extern template class PALUDIS_VISIBLE WrappedForwardIterator<Set<QualifiedPackageName>::ConstIteratorTag, const QualifiedPackageName>;
+ extern template class PALUDIS_VISIBLE WrappedOutputIterator<Set<QualifiedPackageName>::InserterTag, QualifiedPackageName>;
}
#endif
diff --git a/paludis/notifier_callback-fwd.hh b/paludis/notifier_callback-fwd.hh
index ca66fb736..cca62bb15 100644
--- a/paludis/notifier_callback-fwd.hh
+++ b/paludis/notifier_callback-fwd.hh
@@ -24,17 +24,17 @@
namespace paludis
{
- struct NotifierCallbackEvent;
- struct NotifierCallbackGeneratingMetadataEvent;
- struct NotifierCallbackResolverStepEvent;
- struct NotifierCallbackResolverStageEvent;
- struct NotifierCallbackLinkageStepEvent;
+ class NotifierCallbackEvent;
+ class NotifierCallbackGeneratingMetadataEvent;
+ class NotifierCallbackResolverStepEvent;
+ class NotifierCallbackResolverStageEvent;
+ class NotifierCallbackLinkageStepEvent;
typedef std::function<void (const NotifierCallbackEvent &) > NotifierCallbackFunction;
typedef unsigned NotifierCallbackID;
- struct ScopedNotifierCallback;
+ class ScopedNotifierCallback;
}
#endif
diff --git a/paludis/package_dep_spec_collection-fwd.hh b/paludis/package_dep_spec_collection-fwd.hh
index cd70806b1..eb9fb0808 100644
--- a/paludis/package_dep_spec_collection-fwd.hh
+++ b/paludis/package_dep_spec_collection-fwd.hh
@@ -22,7 +22,7 @@
namespace paludis
{
- struct PackageDepSpecCollection;
+ class PackageDepSpecCollection;
}
#endif
diff --git a/paludis/paludislike_options_conf-fwd.hh b/paludis/paludislike_options_conf-fwd.hh
index 7dcc7e6aa..44cbdab00 100644
--- a/paludis/paludislike_options_conf-fwd.hh
+++ b/paludis/paludislike_options_conf-fwd.hh
@@ -22,7 +22,7 @@
namespace paludis
{
- struct PaludisLikeOptionsConf;
+ class PaludisLikeOptionsConf;
struct PaludisLikeOptionsConfParams;
}
diff --git a/paludis/repositories/accounts/accounts_repository_store.hh b/paludis/repositories/accounts/accounts_repository_store.hh
index 915b71546..8a13e3f0e 100644
--- a/paludis/repositories/accounts/accounts_repository_store.hh
+++ b/paludis/repositories/accounts/accounts_repository_store.hh
@@ -33,7 +33,7 @@ namespace paludis
{
namespace accounts_repository
{
- struct AccountsRepository;
+ class AccountsRepository;
class PALUDIS_VISIBLE AccountsRepositoryStore
{
diff --git a/paludis/repositories/e/eapi-fwd.hh b/paludis/repositories/e/eapi-fwd.hh
index 91f21cd74..cab6fb470 100644
--- a/paludis/repositories/e/eapi-fwd.hh
+++ b/paludis/repositories/e/eapi-fwd.hh
@@ -31,22 +31,22 @@ namespace paludis
{
namespace erepository
{
- class EAPIAnnotations;
+ struct EAPIAnnotations;
class EAPIData;
class EAPIConfigurationError;
- class EAPIEbuildPhases;
- class EAPIEbuildMetadataVariables;
- class EAPIEbuildOptions;
+ struct EAPIEbuildPhases;
+ struct EAPIEbuildMetadataVariables;
+ struct EAPIEbuildOptions;
class EAPILabels;
- class EAPIToolsOptions;
- class EAPIPipeCommands;
- class EAPIProfileOptions;
- class EAPIChoicesOptions;
- class EAPIEbuildEnvironmentVariables;
- class SupportedEAPI;
- class EAPI;
-
- class EAPIMetadataVariable;
+ struct EAPIToolsOptions;
+ struct EAPIPipeCommands;
+ struct EAPIProfileOptions;
+ struct EAPIChoicesOptions;
+ struct EAPIEbuildEnvironmentVariables;
+ struct SupportedEAPI;
+ struct EAPI;
+
+ struct EAPIMetadataVariable;
typedef std::function<const std::string (const FSPath &)> EAPIForFileFunction;
diff --git a/paludis/repositories/e/info_metadata_key.hh b/paludis/repositories/e/info_metadata_key.hh
index c988eaadc..1fa002e49 100644
--- a/paludis/repositories/e/info_metadata_key.hh
+++ b/paludis/repositories/e/info_metadata_key.hh
@@ -10,7 +10,7 @@
namespace paludis
{
- struct ERepository;
+ class ERepository;
namespace erepository
{
diff --git a/paludis/repositories/e/pipe_command_handler.hh b/paludis/repositories/e/pipe_command_handler.hh
index f238f4c6e..d3d6a7f3d 100644
--- a/paludis/repositories/e/pipe_command_handler.hh
+++ b/paludis/repositories/e/pipe_command_handler.hh
@@ -31,7 +31,7 @@ namespace paludis
{
namespace erepository
{
- struct ERepositoryID;
+ class ERepositoryID;
std::string pipe_command_handler(const Environment * const,
const std::shared_ptr<const ERepositoryID> &,
diff --git a/paludis/repositories/e/traditional_mask_file.hh b/paludis/repositories/e/traditional_mask_file.hh
index 17fa52295..c05f19db0 100644
--- a/paludis/repositories/e/traditional_mask_file.hh
+++ b/paludis/repositories/e/traditional_mask_file.hh
@@ -33,7 +33,7 @@ namespace paludis
{
namespace erepository
{
- class EAPI;
+ struct EAPI;
class PALUDIS_VISIBLE TraditionalMaskFile
{
diff --git a/paludis/repositories/e/traditional_profile_file.hh b/paludis/repositories/e/traditional_profile_file.hh
index 810bd04e0..b91adf04f 100644
--- a/paludis/repositories/e/traditional_profile_file.hh
+++ b/paludis/repositories/e/traditional_profile_file.hh
@@ -31,7 +31,7 @@
namespace paludis
{
- struct ERepository;
+ class ERepository;
namespace erepository
{
diff --git a/paludis/repositories/unpackaged/unpackaged_key.hh b/paludis/repositories/unpackaged/unpackaged_key.hh
index 5abade20c..b4f54a53f 100644
--- a/paludis/repositories/unpackaged/unpackaged_key.hh
+++ b/paludis/repositories/unpackaged/unpackaged_key.hh
@@ -27,7 +27,7 @@ namespace paludis
{
namespace unpackaged_repositories
{
- struct UnpackagedID;
+ class UnpackagedID;
class UnpackagedDependencyKey :
public MetadataSpecTreeKey<DependencySpecTree>
diff --git a/paludis/repositories/unwritten/unwritten_id.hh b/paludis/repositories/unwritten/unwritten_id.hh
index 169171cac..95170011b 100644
--- a/paludis/repositories/unwritten/unwritten_id.hh
+++ b/paludis/repositories/unwritten/unwritten_id.hh
@@ -48,7 +48,7 @@ namespace paludis
namespace unwritten_repository
{
- struct UnwrittenRepository;
+ class UnwrittenRepository;
struct UnwrittenIDParams
{
diff --git a/paludis/repositories/unwritten/unwritten_repository_store.hh b/paludis/repositories/unwritten/unwritten_repository_store.hh
index 831f5db32..886794cac 100644
--- a/paludis/repositories/unwritten/unwritten_repository_store.hh
+++ b/paludis/repositories/unwritten/unwritten_repository_store.hh
@@ -39,7 +39,7 @@ namespace paludis
namespace unwritten_repository
{
- struct UnwrittenRepository;
+ class UnwrittenRepository;
struct UnwrittenRepositoryInformation
{
diff --git a/paludis/resolver/allow_choice_changes_helper-fwd.hh b/paludis/resolver/allow_choice_changes_helper-fwd.hh
index af4269845..73c027e08 100644
--- a/paludis/resolver/allow_choice_changes_helper-fwd.hh
+++ b/paludis/resolver/allow_choice_changes_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct AllowChoiceChangesHelper;
+ class AllowChoiceChangesHelper;
}
}
diff --git a/paludis/resolver/allowed_to_remove_helper-fwd.hh b/paludis/resolver/allowed_to_remove_helper-fwd.hh
index 568ef5424..84c1bac34 100644
--- a/paludis/resolver/allowed_to_remove_helper-fwd.hh
+++ b/paludis/resolver/allowed_to_remove_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct AllowedToRemoveHelper;
+ class AllowedToRemoveHelper;
}
}
diff --git a/paludis/resolver/allowed_to_restart_helper-fwd.hh b/paludis/resolver/allowed_to_restart_helper-fwd.hh
index 9dfd4420e..034a6bc56 100644
--- a/paludis/resolver/allowed_to_restart_helper-fwd.hh
+++ b/paludis/resolver/allowed_to_restart_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct AllowedToRestartHelper;
+ class AllowedToRestartHelper;
}
}
diff --git a/paludis/resolver/always_via_binary_helper-fwd.hh b/paludis/resolver/always_via_binary_helper-fwd.hh
index c52816771..a7850dbf0 100644
--- a/paludis/resolver/always_via_binary_helper-fwd.hh
+++ b/paludis/resolver/always_via_binary_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct AlwaysViaBinaryHelper;
+ class AlwaysViaBinaryHelper;
}
}
diff --git a/paludis/resolver/can_use_helper-fwd.hh b/paludis/resolver/can_use_helper-fwd.hh
index 7c4f629e3..46c7100c3 100644
--- a/paludis/resolver/can_use_helper-fwd.hh
+++ b/paludis/resolver/can_use_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct CanUseHelper;
+ class CanUseHelper;
}
}
diff --git a/paludis/resolver/confirm_helper-fwd.hh b/paludis/resolver/confirm_helper-fwd.hh
index 55898cbc6..b22061d02 100644
--- a/paludis/resolver/confirm_helper-fwd.hh
+++ b/paludis/resolver/confirm_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct ConfirmHelper;
+ class ConfirmHelper;
}
}
diff --git a/paludis/resolver/constraint-fwd.hh b/paludis/resolver/constraint-fwd.hh
index d9f225dff..37a3d3443 100644
--- a/paludis/resolver/constraint-fwd.hh
+++ b/paludis/resolver/constraint-fwd.hh
@@ -29,7 +29,7 @@ namespace paludis
namespace resolver
{
struct Constraint;
- struct Constraints;
+ class Constraints;
typedef Sequence<std::shared_ptr<const Constraint> > ConstraintSequence;
}
diff --git a/paludis/resolver/decider-fwd.hh b/paludis/resolver/decider-fwd.hh
index 3a4fbfd16..8e9c6730a 100644
--- a/paludis/resolver/decider-fwd.hh
+++ b/paludis/resolver/decider-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct Decider;
+ class Decider;
}
}
diff --git a/paludis/resolver/decisions-fwd.hh b/paludis/resolver/decisions-fwd.hh
index 343ea005e..a0b287e75 100644
--- a/paludis/resolver/decisions-fwd.hh
+++ b/paludis/resolver/decisions-fwd.hh
@@ -30,7 +30,7 @@ namespace paludis
namespace resolver
{
template <typename Decision_, typename Notes_ = NoType<0u> *>
- struct Decisions;
+ class Decisions;
typedef Decisions<ChangeOrRemoveDecision, std::shared_ptr<const OrdererNotes> > OrderedChangeOrRemoveDecisions;
}
diff --git a/paludis/resolver/find_replacing_helper-fwd.hh b/paludis/resolver/find_replacing_helper-fwd.hh
index 25cbbbdaf..7120723e4 100644
--- a/paludis/resolver/find_replacing_helper-fwd.hh
+++ b/paludis/resolver/find_replacing_helper-fwd.hh
@@ -7,7 +7,7 @@ namespace paludis
{
namespace resolver
{
- struct FindReplacingHelper;
+ class FindReplacingHelper;
}
}
diff --git a/paludis/resolver/find_repository_for_helper-fwd.hh b/paludis/resolver/find_repository_for_helper-fwd.hh
index 30f4d7db6..ec3ea16b2 100644
--- a/paludis/resolver/find_repository_for_helper-fwd.hh
+++ b/paludis/resolver/find_repository_for_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct FindRepositoryForHelper;
+ class FindRepositoryForHelper;
}
}
diff --git a/paludis/resolver/get_constraints_for_dependent_helper-fwd.hh b/paludis/resolver/get_constraints_for_dependent_helper-fwd.hh
index 968ae2833..a9f0ccb8d 100644
--- a/paludis/resolver/get_constraints_for_dependent_helper-fwd.hh
+++ b/paludis/resolver/get_constraints_for_dependent_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct GetConstraintsForDependentHelper;
+ class GetConstraintsForDependentHelper;
}
}
diff --git a/paludis/resolver/get_constraints_for_purge_helper-fwd.hh b/paludis/resolver/get_constraints_for_purge_helper-fwd.hh
index 03b1a1203..c75fb1e3a 100644
--- a/paludis/resolver/get_constraints_for_purge_helper-fwd.hh
+++ b/paludis/resolver/get_constraints_for_purge_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct GetConstraintsForPurgeHelper;
+ class GetConstraintsForPurgeHelper;
}
}
diff --git a/paludis/resolver/get_constraints_for_via_binary_helper-fwd.hh b/paludis/resolver/get_constraints_for_via_binary_helper-fwd.hh
index f4219d767..83a060438 100644
--- a/paludis/resolver/get_constraints_for_via_binary_helper-fwd.hh
+++ b/paludis/resolver/get_constraints_for_via_binary_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct GetConstraintsForViaBinaryHelper;
+ class GetConstraintsForViaBinaryHelper;
}
}
diff --git a/paludis/resolver/get_destination_types_for_blocker_helper-fwd.hh b/paludis/resolver/get_destination_types_for_blocker_helper-fwd.hh
index f6f96ed63..cad8f3bc3 100644
--- a/paludis/resolver/get_destination_types_for_blocker_helper-fwd.hh
+++ b/paludis/resolver/get_destination_types_for_blocker_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct GetDestinationTypesForBlockerHelper;
+ class GetDestinationTypesForBlockerHelper;
}
}
diff --git a/paludis/resolver/get_destination_types_for_error_helper-fwd.hh b/paludis/resolver/get_destination_types_for_error_helper-fwd.hh
index 5df117e9e..0550568f1 100644
--- a/paludis/resolver/get_destination_types_for_error_helper-fwd.hh
+++ b/paludis/resolver/get_destination_types_for_error_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct GetDestinationTypesForErrorHelper;
+ class GetDestinationTypesForErrorHelper;
}
}
diff --git a/paludis/resolver/get_initial_constraints_for_helper-fwd.hh b/paludis/resolver/get_initial_constraints_for_helper-fwd.hh
index 02047fa86..8ecb31b1d 100644
--- a/paludis/resolver/get_initial_constraints_for_helper-fwd.hh
+++ b/paludis/resolver/get_initial_constraints_for_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct GetInitialConstraintsForHelper;
+ class GetInitialConstraintsForHelper;
}
}
diff --git a/paludis/resolver/get_resolvents_for_helper-fwd.hh b/paludis/resolver/get_resolvents_for_helper-fwd.hh
index 2ff795962..07bfe65e9 100644
--- a/paludis/resolver/get_resolvents_for_helper-fwd.hh
+++ b/paludis/resolver/get_resolvents_for_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct GetResolventsForHelper;
+ class GetResolventsForHelper;
}
}
diff --git a/paludis/resolver/get_use_existing_nothing_helper-fwd.hh b/paludis/resolver/get_use_existing_nothing_helper-fwd.hh
index 8d07e49d5..23088a71e 100644
--- a/paludis/resolver/get_use_existing_nothing_helper-fwd.hh
+++ b/paludis/resolver/get_use_existing_nothing_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct GetUseExistingNothingHelper;
+ class GetUseExistingNothingHelper;
}
}
diff --git a/paludis/resolver/interest_in_spec_helper-fwd.hh b/paludis/resolver/interest_in_spec_helper-fwd.hh
index 078973ca0..c794323fd 100644
--- a/paludis/resolver/interest_in_spec_helper-fwd.hh
+++ b/paludis/resolver/interest_in_spec_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct InterestInSpecHelper;
+ class InterestInSpecHelper;
}
}
diff --git a/paludis/resolver/job_list-fwd.hh b/paludis/resolver/job_list-fwd.hh
index da4256e8f..aa7ff1795 100644
--- a/paludis/resolver/job_list-fwd.hh
+++ b/paludis/resolver/job_list-fwd.hh
@@ -25,7 +25,7 @@ namespace paludis
namespace resolver
{
template <typename Job_>
- struct JobList;
+ class JobList;
typedef int JobNumber;
}
diff --git a/paludis/resolver/job_state-fwd.hh b/paludis/resolver/job_state-fwd.hh
index 2970e5f47..d157c9f31 100644
--- a/paludis/resolver/job_state-fwd.hh
+++ b/paludis/resolver/job_state-fwd.hh
@@ -24,13 +24,13 @@ namespace paludis
{
namespace resolver
{
- struct JobState;
+ class JobState;
- struct JobPendingState;
- struct JobActiveState;
- struct JobSucceededState;
- struct JobFailedState;
- struct JobSkippedState;
+ class JobPendingState;
+ class JobActiveState;
+ class JobSucceededState;
+ class JobFailedState;
+ class JobSkippedState;
}
}
diff --git a/paludis/resolver/make_destination_filtered_generator_helper-fwd.hh b/paludis/resolver/make_destination_filtered_generator_helper-fwd.hh
index 47d9dfc26..c093fe587 100644
--- a/paludis/resolver/make_destination_filtered_generator_helper-fwd.hh
+++ b/paludis/resolver/make_destination_filtered_generator_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct MakeDestinationFilteredGeneratorHelper;
+ class MakeDestinationFilteredGeneratorHelper;
}
}
diff --git a/paludis/resolver/make_origin_filtered_generator_helper-fwd.hh b/paludis/resolver/make_origin_filtered_generator_helper-fwd.hh
index c073ec5ed..3ee009296 100644
--- a/paludis/resolver/make_origin_filtered_generator_helper-fwd.hh
+++ b/paludis/resolver/make_origin_filtered_generator_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct MakeOriginFilteredGeneratorHelper;
+ class MakeOriginFilteredGeneratorHelper;
}
}
diff --git a/paludis/resolver/make_unmaskable_filter_helper-fwd.hh b/paludis/resolver/make_unmaskable_filter_helper-fwd.hh
index d3bf86d25..92ae3f385 100644
--- a/paludis/resolver/make_unmaskable_filter_helper-fwd.hh
+++ b/paludis/resolver/make_unmaskable_filter_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct MakeUnmaskableFilterHelper;
+ class MakeUnmaskableFilterHelper;
}
}
diff --git a/paludis/resolver/nag-fwd.hh b/paludis/resolver/nag-fwd.hh
index 615fa49bb..9f16b656b 100644
--- a/paludis/resolver/nag-fwd.hh
+++ b/paludis/resolver/nag-fwd.hh
@@ -30,7 +30,7 @@ namespace paludis
#include <paludis/resolver/nag-se.hh>
- struct NAG;
+ class NAG;
struct NAGIndex;
struct NAGEdgeProperties;
diff --git a/paludis/resolver/order_early_helper-fwd.hh b/paludis/resolver/order_early_helper-fwd.hh
index 6e697a287..75e015798 100644
--- a/paludis/resolver/order_early_helper-fwd.hh
+++ b/paludis/resolver/order_early_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct OrderEarlyHelper;
+ class OrderEarlyHelper;
}
}
diff --git a/paludis/resolver/orderer-fwd.hh b/paludis/resolver/orderer-fwd.hh
index 37326bd63..264812cb8 100644
--- a/paludis/resolver/orderer-fwd.hh
+++ b/paludis/resolver/orderer-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct Orderer;
+ class Orderer;
}
}
diff --git a/paludis/resolver/prefer_or_avoid_helper-fwd.hh b/paludis/resolver/prefer_or_avoid_helper-fwd.hh
index b7c9e8e6b..4290ecf77 100644
--- a/paludis/resolver/prefer_or_avoid_helper-fwd.hh
+++ b/paludis/resolver/prefer_or_avoid_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct PreferOrAvoidHelper;
+ class PreferOrAvoidHelper;
}
}
diff --git a/paludis/resolver/reason-fwd.hh b/paludis/resolver/reason-fwd.hh
index e10406b6a..621d9e810 100644
--- a/paludis/resolver/reason-fwd.hh
+++ b/paludis/resolver/reason-fwd.hh
@@ -29,15 +29,15 @@ namespace paludis
{
namespace resolver
{
- struct Reason;
- struct DependencyReason;
- struct TargetReason;
- struct PresetReason;
- struct SetReason;
- struct DependentReason;
- struct WasUsedByReason;
- struct LikeOtherDestinationTypeReason;
- struct ViaBinaryReason;
+ class Reason;
+ class DependencyReason;
+ class TargetReason;
+ class PresetReason;
+ class SetReason;
+ class DependentReason;
+ class WasUsedByReason;
+ class LikeOtherDestinationTypeReason;
+ class ViaBinaryReason;
typedef Sequence<std::shared_ptr<const Reason> > Reasons;
}
diff --git a/paludis/resolver/remove_if_dependent_helper-fwd.hh b/paludis/resolver/remove_if_dependent_helper-fwd.hh
index 769d46bca..1cee2b53a 100644
--- a/paludis/resolver/remove_if_dependent_helper-fwd.hh
+++ b/paludis/resolver/remove_if_dependent_helper-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct RemoveIfDependentHelper;
+ class RemoveIfDependentHelper;
}
}
diff --git a/paludis/resolver/required_confirmations-fwd.hh b/paludis/resolver/required_confirmations-fwd.hh
index a30fd5981..7f0faf57b 100644
--- a/paludis/resolver/required_confirmations-fwd.hh
+++ b/paludis/resolver/required_confirmations-fwd.hh
@@ -27,13 +27,13 @@ namespace paludis
{
namespace resolver
{
- struct RequiredConfirmation;
- struct DowngradeConfirmation;
- struct NotBestConfirmation;
- struct BreakConfirmation;
- struct RemoveSystemPackageConfirmation;
- struct MaskedConfirmation;
- struct ChangedChoicesConfirmation;
+ class RequiredConfirmation;
+ class DowngradeConfirmation;
+ class NotBestConfirmation;
+ class BreakConfirmation;
+ class RemoveSystemPackageConfirmation;
+ class MaskedConfirmation;
+ class ChangedChoicesConfirmation;
typedef Sequence<std::shared_ptr<const RequiredConfirmation> > RequiredConfirmations;
}
diff --git a/paludis/resolver/resolutions_by_resolvent-fwd.hh b/paludis/resolver/resolutions_by_resolvent-fwd.hh
index d75f9fdd1..c97ff63a3 100644
--- a/paludis/resolver/resolutions_by_resolvent-fwd.hh
+++ b/paludis/resolver/resolutions_by_resolvent-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct ResolutionsByResolvent;
+ class ResolutionsByResolvent;
}
}
diff --git a/paludis/resolver/resolver-fwd.hh b/paludis/resolver/resolver-fwd.hh
index 495bb5dca..885a629f8 100644
--- a/paludis/resolver/resolver-fwd.hh
+++ b/paludis/resolver/resolver-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct Resolver;
+ class Resolver;
struct ResolverLists;
}
}
diff --git a/paludis/resolver/sanitised_dependencies-fwd.hh b/paludis/resolver/sanitised_dependencies-fwd.hh
index 1f801645a..8039f4bfb 100644
--- a/paludis/resolver/sanitised_dependencies-fwd.hh
+++ b/paludis/resolver/sanitised_dependencies-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct SanitisedDependencies;
+ class SanitisedDependencies;
struct SanitisedDependency;
}
}
diff --git a/paludis/resolver/suggest_restart-fwd.hh b/paludis/resolver/suggest_restart-fwd.hh
index d63f2b550..667c7b018 100644
--- a/paludis/resolver/suggest_restart-fwd.hh
+++ b/paludis/resolver/suggest_restart-fwd.hh
@@ -24,7 +24,7 @@ namespace paludis
{
namespace resolver
{
- struct SuggestRestart;
+ class SuggestRestart;
}
}
diff --git a/paludis/serialise-fwd.hh b/paludis/serialise-fwd.hh
index 045517e72..0f62f4c5e 100644
--- a/paludis/serialise-fwd.hh
+++ b/paludis/serialise-fwd.hh
@@ -22,10 +22,10 @@
namespace paludis
{
- struct Serialiser;
+ class Serialiser;
- struct Deserialiser;
- struct Deserialisation;
+ class Deserialiser;
+ class Deserialisation;
}
#endif
diff --git a/paludis/slot_requirement-fwd.hh b/paludis/slot_requirement-fwd.hh
index 46ce6d4d6..a4ce9da07 100644
--- a/paludis/slot_requirement-fwd.hh
+++ b/paludis/slot_requirement-fwd.hh
@@ -25,13 +25,13 @@
namespace paludis
{
- struct SlotRequirement;
- struct SlotExactFullRequirement;
- struct SlotExactPartialRequirement;
- struct SlotAnyAtAllLockedRequirement;
- struct SlotAnyPartialLockedRequirement;
- struct SlotAnyUnlockedRequirement;
- struct SlotUnknownRewrittenRequirement;
+ class SlotRequirement;
+ class SlotExactFullRequirement;
+ class SlotExactPartialRequirement;
+ class SlotAnyAtAllLockedRequirement;
+ class SlotAnyPartialLockedRequirement;
+ class SlotAnyUnlockedRequirement;
+ class SlotUnknownRewrittenRequirement;
std::ostream & operator<< (std::ostream &, const SlotRequirement &) PALUDIS_VISIBLE;
}
diff --git a/paludis/spec_tree-fwd.hh b/paludis/spec_tree-fwd.hh
index 831cf4e78..de92536a2 100644
--- a/paludis/spec_tree-fwd.hh
+++ b/paludis/spec_tree-fwd.hh
@@ -40,7 +40,7 @@ namespace paludis
class LeafNode;
template <typename Tree_, typename Item_>
- struct InnerNode;
+ class InnerNode;
template <typename Tree_>
class BasicInnerNode;
diff --git a/paludis/spec_tree.hh b/paludis/spec_tree.hh
index 95b33b23d..dc7850c64 100644
--- a/paludis/spec_tree.hh
+++ b/paludis/spec_tree.hh
@@ -54,7 +54,7 @@ namespace paludis
};
template <typename Tree_, typename Item_>
- struct InnerNode;
+ class InnerNode;
template <typename Tree_>
class PALUDIS_VISIBLE BasicInnerNode :
diff --git a/paludis/stripper-fwd.hh b/paludis/stripper-fwd.hh
index 3cf5b204f..fd0edbc03 100644
--- a/paludis/stripper-fwd.hh
+++ b/paludis/stripper-fwd.hh
@@ -23,7 +23,7 @@
namespace paludis
{
class Stripper;
- class StripperOptions;
+ struct StripperOptions;
}
#endif
diff --git a/paludis/user_dep_spec-fwd.hh b/paludis/user_dep_spec-fwd.hh
index d775ce6dc..1c8a9fde0 100644
--- a/paludis/user_dep_spec-fwd.hh
+++ b/paludis/user_dep_spec-fwd.hh
@@ -63,10 +63,10 @@ namespace paludis
///\}
};
- struct UserSlotExactFullRequirement;
- struct UserSlotExactPartialRequirement;
+ class UserSlotExactFullRequirement;
+ class UserSlotExactPartialRequirement;
- struct UserKeyRequirement;
+ class UserKeyRequirement;
/**
* The VersionSpecOptions to use for parsing a user spec.
diff --git a/paludis/util/active_object_ptr-fwd.hh b/paludis/util/active_object_ptr-fwd.hh
index 7930392d8..3530da3bd 100644
--- a/paludis/util/active_object_ptr-fwd.hh
+++ b/paludis/util/active_object_ptr-fwd.hh
@@ -25,7 +25,7 @@
namespace paludis
{
template <typename T_>
- struct ActiveObjectPtr;
+ class ActiveObjectPtr;
}
#endif
diff --git a/paludis/util/buffer_output_stream-fwd.hh b/paludis/util/buffer_output_stream-fwd.hh
index 81e73157a..94a19a9f7 100644
--- a/paludis/util/buffer_output_stream-fwd.hh
+++ b/paludis/util/buffer_output_stream-fwd.hh
@@ -22,7 +22,7 @@
namespace paludis
{
- struct BufferOutputStream;
+ class BufferOutputStream;
}
#endif
diff --git a/paludis/util/deferred_construction_ptr-fwd.hh b/paludis/util/deferred_construction_ptr-fwd.hh
index a84e7e6ac..638153183 100644
--- a/paludis/util/deferred_construction_ptr-fwd.hh
+++ b/paludis/util/deferred_construction_ptr-fwd.hh
@@ -23,7 +23,7 @@
namespace paludis
{
template <typename>
- struct DeferredConstructionPtr;
+ class DeferredConstructionPtr;
}
#endif
diff --git a/paludis/util/elf_sections.hh b/paludis/util/elf_sections.hh
index 3569e81f4..69683704a 100644
--- a/paludis/util/elf_sections.hh
+++ b/paludis/util/elf_sections.hh
@@ -36,8 +36,8 @@ namespace paludis
template <typename ElfType_> class GenericSection;
template <typename ElfType_, class RelocationType_> class RelocationSection;
- template <typename ElfType_> class Relocation;
- template <typename ElfType_> class RelocationA;
+ template <typename ElfType_> struct Relocation;
+ template <typename ElfType_> struct RelocationA;
namespace littlelf_internals
{
diff --git a/paludis/util/enum_iterator-fwd.hh b/paludis/util/enum_iterator-fwd.hh
index 39e0b058b..59c9b4130 100644
--- a/paludis/util/enum_iterator-fwd.hh
+++ b/paludis/util/enum_iterator-fwd.hh
@@ -25,7 +25,7 @@
namespace paludis
{
template <typename E_>
- struct EnumIterator;
+ class EnumIterator;
template <typename E_>
EnumIterator<E_> enum_iterator(const E_) PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/util/executor-fwd.hh b/paludis/util/executor-fwd.hh
index b50797629..2a6750e74 100644
--- a/paludis/util/executor-fwd.hh
+++ b/paludis/util/executor-fwd.hh
@@ -22,8 +22,8 @@
namespace paludis
{
- struct Executor;
- struct Executive;
+ class Executor;
+ class Executive;
}
#endif
diff --git a/paludis/util/fs_iterator-fwd.hh b/paludis/util/fs_iterator-fwd.hh
index 2c8e433ce..5ff736021 100644
--- a/paludis/util/fs_iterator-fwd.hh
+++ b/paludis/util/fs_iterator-fwd.hh
@@ -26,7 +26,7 @@
namespace paludis
{
- struct FSIterator;
+ class FSIterator;
#include <paludis/util/fs_iterator-se.hh>
diff --git a/paludis/util/fs_path-fwd.hh b/paludis/util/fs_path-fwd.hh
index 5378d3ead..649338830 100644
--- a/paludis/util/fs_path-fwd.hh
+++ b/paludis/util/fs_path-fwd.hh
@@ -28,8 +28,8 @@
namespace paludis
{
- struct FSPath;
- struct FSPathComparator;
+ class FSPath;
+ class FSPathComparator;
typedef Sequence<FSPath> FSPathSequence;
diff --git a/paludis/util/fs_stat-fwd.hh b/paludis/util/fs_stat-fwd.hh
index ba2c94992..b943f7df8 100644
--- a/paludis/util/fs_stat-fwd.hh
+++ b/paludis/util/fs_stat-fwd.hh
@@ -22,7 +22,7 @@
namespace paludis
{
- struct FSStat;
+ class FSStat;
}
#endif
diff --git a/paludis/util/indirect_iterator-fwd.hh b/paludis/util/indirect_iterator-fwd.hh
index 271f9e942..8c0d7017e 100644
--- a/paludis/util/indirect_iterator-fwd.hh
+++ b/paludis/util/indirect_iterator-fwd.hh
@@ -29,7 +29,7 @@ namespace paludis
template <typename Iter_, typename Value_ = typename IndirectIteratorValueType<
typename std::iterator_traits<Iter_>::value_type>::Type>
- struct IndirectIterator;
+ class IndirectIterator;
template <typename Iter_>
IndirectIterator<Iter_> indirect_iterator(const Iter_ &);
diff --git a/paludis/util/map-fwd.hh b/paludis/util/map-fwd.hh
index 5da54f6aa..12b06ec83 100644
--- a/paludis/util/map-fwd.hh
+++ b/paludis/util/map-fwd.hh
@@ -32,7 +32,7 @@ namespace paludis
struct DefaultMapComparator;
template <typename K_, typename V_, typename C_ = DefaultMapComparator<K_> >
- struct Map;
+ class Map;
template <typename K_, typename V_, typename C_ = DefaultMapComparator<K_> >
struct MapConstIteratorTag;
diff --git a/paludis/util/map.cc b/paludis/util/map.cc
index d642eba62..3398061d7 100644
--- a/paludis/util/map.cc
+++ b/paludis/util/map.cc
@@ -28,7 +28,7 @@ using namespace paludis;
namespace paludis
{
template class Map<std::string, std::string>;
- template class PALUDIS_VISIBLE DefaultMapComparator<std::string>;
+ template struct PALUDIS_VISIBLE DefaultMapComparator<std::string>;
template class WrappedForwardIterator<Map<std::string, std::string>::ConstIteratorTag, const std::pair<const std::string, std::string> >;
template class PALUDIS_VISIBLE WrappedOutputIterator<Map<std::string, std::string>::InserterTag, std::pair<const std::string, std::string> >;
}
diff --git a/paludis/util/named_value-fwd.hh b/paludis/util/named_value-fwd.hh
index f8f0a768b..0a5b5fd51 100644
--- a/paludis/util/named_value-fwd.hh
+++ b/paludis/util/named_value-fwd.hh
@@ -26,7 +26,7 @@ namespace paludis
class NamedValue;
template <typename T_>
- struct Name;
+ class Name;
}
#endif
diff --git a/paludis/util/process-fwd.hh b/paludis/util/process-fwd.hh
index 35fcd2ca2..4c7121a62 100644
--- a/paludis/util/process-fwd.hh
+++ b/paludis/util/process-fwd.hh
@@ -22,14 +22,14 @@
namespace paludis
{
- struct ProcessError;
+ class ProcessError;
- struct ProcessCommand;
+ class ProcessCommand;
- struct Process;
+ class Process;
struct RunningProcessThread;
- struct RunningProcessHandle;
+ class RunningProcessHandle;
}
#endif
diff --git a/paludis/util/sequence-fwd.hh b/paludis/util/sequence-fwd.hh
index 67a7d4223..29e875c57 100644
--- a/paludis/util/sequence-fwd.hh
+++ b/paludis/util/sequence-fwd.hh
@@ -29,16 +29,16 @@
namespace paludis
{
template <typename T_>
- struct Sequence;
+ class Sequence;
template <typename T_>
- struct SequenceConstIteratorTag;
+ class SequenceConstIteratorTag;
template <typename T_>
- struct SequenceReverseConstIteratorTag;
+ class SequenceReverseConstIteratorTag;
template <typename T_>
- struct SequenceInserterTag;
+ class SequenceInserterTag;
}
#endif
diff --git a/paludis/util/set-fwd.hh b/paludis/util/set-fwd.hh
index 4a6193f6c..ea8c7aec4 100644
--- a/paludis/util/set-fwd.hh
+++ b/paludis/util/set-fwd.hh
@@ -32,7 +32,7 @@ namespace paludis
struct DefaultSetComparator;
template <typename T_, typename C_ = DefaultSetComparator<T_> >
- struct Set;
+ class Set;
template <typename T_, typename C_>
struct SetConstIteratorTag;
diff --git a/paludis/util/simple_parser.cc b/paludis/util/simple_parser.cc
index ac1e5b486..d67466d56 100644
--- a/paludis/util/simple_parser.cc
+++ b/paludis/util/simple_parser.cc
@@ -294,5 +294,5 @@ SimpleParser::current_line_number() const
namespace paludis
{
- template struct Pimp<SimpleParser>;
+ template class Pimp<SimpleParser>;
}
diff --git a/paludis/util/simple_parser.hh b/paludis/util/simple_parser.hh
index 356ac10b5..c6d1fae96 100644
--- a/paludis/util/simple_parser.hh
+++ b/paludis/util/simple_parser.hh
@@ -90,7 +90,7 @@ namespace paludis
const std::string text() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
- extern template struct Pimp<SimpleParser>;
+ extern template class Pimp<SimpleParser>;
}
#endif
diff --git a/paludis/util/string_list_stream-fwd.hh b/paludis/util/string_list_stream-fwd.hh
index b5c8ff4c3..90381ef9b 100644
--- a/paludis/util/string_list_stream-fwd.hh
+++ b/paludis/util/string_list_stream-fwd.hh
@@ -22,7 +22,7 @@
namespace paludis
{
- struct StringListStream;
+ class StringListStream;
}
#endif
diff --git a/paludis/util/timestamp-fwd.hh b/paludis/util/timestamp-fwd.hh
index 6c329f4f2..1eaefd094 100644
--- a/paludis/util/timestamp-fwd.hh
+++ b/paludis/util/timestamp-fwd.hh
@@ -22,7 +22,7 @@
namespace paludis
{
- struct Timestamp;
+ class Timestamp;
}
#endif
diff --git a/paludis/util/tokeniser.hh b/paludis/util/tokeniser.hh
index 91168e1df..d34d237a5 100644
--- a/paludis/util/tokeniser.hh
+++ b/paludis/util/tokeniser.hh
@@ -196,7 +196,7 @@ namespace paludis
};
template <typename DelimKind_, typename DelimMode_ = delim_mode::DelimiterTag>
- struct Tokeniser;
+ class Tokeniser;
template <typename DelimMode_>
class Tokeniser<delim_kind::AnyOfTag, DelimMode_>
diff --git a/paludis/util/tribool-fwd.hh b/paludis/util/tribool-fwd.hh
index ae4cb67d6..018d14c0b 100644
--- a/paludis/util/tribool-fwd.hh
+++ b/paludis/util/tribool-fwd.hh
@@ -26,7 +26,7 @@
namespace paludis
{
- struct Tribool;
+ class Tribool;
typedef NoType<0u> * (* TriboolIndeterminateValueType) (const NoType<0u> * const);
diff --git a/paludis/util/visitor-fwd.hh b/paludis/util/visitor-fwd.hh
index 60313dea0..2313a3509 100644
--- a/paludis/util/visitor-fwd.hh
+++ b/paludis/util/visitor-fwd.hh
@@ -25,31 +25,31 @@
namespace paludis
{
template <typename TypeList_>
- struct DeclareAbstractVisitMethods;
+ class DeclareAbstractVisitMethods;
template <>
- struct DeclareAbstractVisitMethods<TypeListTail>;
+ class DeclareAbstractVisitMethods<TypeListTail>;
template <typename TypeList_>
- struct WrappedVisitorBase;
+ class WrappedVisitorBase;
template <typename RealClass_, typename TypeList_>
- struct ImplementVisitMethods;
+ class ImplementVisitMethods;
template <typename RealClass_>
- struct ImplementVisitMethods<RealClass_, TypeListTail>;
+ class ImplementVisitMethods<RealClass_, TypeListTail>;
template <typename TypeList_, typename UnwrappedVisitor_>
- struct WrappedVoidResultVisitor;
+ class WrappedVoidResultVisitor;
template <typename TypeList_, typename Result_, typename UnwrappedVisitor_>
- struct WrappedNonVoidResultVisitor;
+ class WrappedNonVoidResultVisitor;
template <typename BaseClass_, typename VisitableTypeList_>
- struct DeclareAbstractAcceptMethods;
+ class DeclareAbstractAcceptMethods;
template <typename BaseClass_, typename RealClass_>
- struct ImplementAcceptMethods;
+ class ImplementAcceptMethods;
}
#endif
diff --git a/paludis/util/visitor.hh b/paludis/util/visitor.hh
index b88ae4f8f..af4fdde2f 100644
--- a/paludis/util/visitor.hh
+++ b/paludis/util/visitor.hh
@@ -26,9 +26,10 @@
namespace paludis
{
template <>
- struct DeclareAbstractVisitMethods<TypeListTail>
+ class DeclareAbstractVisitMethods<TypeListTail>
{
- void forward_visit(const NoType<0u> &);
+ public:
+ void forward_visit(const NoType<0u> &);
};
template <typename TypeList_>
diff --git a/paludis/util/wrapped_forward_iterator-fwd.hh b/paludis/util/wrapped_forward_iterator-fwd.hh
index 54fd31a94..a14ae382e 100644
--- a/paludis/util/wrapped_forward_iterator-fwd.hh
+++ b/paludis/util/wrapped_forward_iterator-fwd.hh
@@ -23,7 +23,7 @@
namespace paludis
{
template <typename Tag_, typename Value_>
- struct WrappedForwardIterator;
+ class WrappedForwardIterator;
template <typename Tag_>
struct WrappedForwardIteratorTraits;
diff --git a/paludis/util/wrapped_output_iterator-fwd.hh b/paludis/util/wrapped_output_iterator-fwd.hh
index d978bfde5..57d6b918b 100644
--- a/paludis/util/wrapped_output_iterator-fwd.hh
+++ b/paludis/util/wrapped_output_iterator-fwd.hh
@@ -23,12 +23,12 @@
namespace paludis
{
template <typename Tag_, typename Value_>
- struct WrappedOutputIterator;
+ class WrappedOutputIterator;
template <typename Tag_>
struct WrappedOutputIteratorTraits;
- struct WrappedOutputIteratorUnderlyingIteratorHolder;
+ class WrappedOutputIteratorUnderlyingIteratorHolder;
}
#endif
diff --git a/paludis/util/wrapped_value-fwd.hh b/paludis/util/wrapped_value-fwd.hh
index 49a1d8390..526aa73fb 100644
--- a/paludis/util/wrapped_value-fwd.hh
+++ b/paludis/util/wrapped_value-fwd.hh
@@ -26,7 +26,7 @@
namespace paludis
{
template <typename Tag_>
- struct WrappedValue;
+ class WrappedValue;
template <typename Tag_>
struct WrappedValueTraits;
diff --git a/paludis/version_requirements-fwd.hh b/paludis/version_requirements-fwd.hh
index 2528b85d4..58cf25252 100644
--- a/paludis/version_requirements-fwd.hh
+++ b/paludis/version_requirements-fwd.hh
@@ -34,7 +34,7 @@
namespace paludis
{
- class VersionRequirement;
+ struct VersionRequirement;
/**
* A collection of VersionRequirement instances, usually for a