aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-02-16 14:17:11 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-02-16 14:17:11 +0000
commit1a8e8f7793bd8032f78023a3e5b294787d95e3e7 (patch)
tree82d08b6450f7ca851bc6cd03269379ddbd6b500a
parentbd7d77e58c333cca237693041824f301c9128700 (diff)
downloadpaludis-1a8e8f7793bd8032f78023a3e5b294787d95e3e7.tar.gz
paludis-1a8e8f7793bd8032f78023a3e5b294787d95e3e7.tar.xz
icc90 blows goats.
-rw-r--r--paludis/qa/changelog_check.hh2
-rw-r--r--paludis/qa/create_metadata_check.hh2
-rw-r--r--paludis/qa/dep_any_check.hh2
-rw-r--r--paludis/qa/dep_flags_check.hh2
-rw-r--r--paludis/qa/deps_exist_check.hh2
-rw-r--r--paludis/qa/deps_visible_check.hh2
-rw-r--r--paludis/qa/description_check.hh2
-rw-r--r--paludis/qa/ebuild_check.hh12
-rw-r--r--paludis/qa/file_check.hh17
-rw-r--r--paludis/qa/file_name_check.hh2
-rw-r--r--paludis/qa/file_permissions_check.hh2
-rw-r--r--paludis/qa/files_dir_size_check.hh2
-rw-r--r--paludis/qa/glep_31_check.hh2
-rw-r--r--paludis/qa/has_ebuilds_check.hh2
-rw-r--r--paludis/qa/has_misc_files_check.hh2
-rw-r--r--paludis/qa/homepage_check.hh2
-rw-r--r--paludis/qa/keywords_check.cc2
-rw-r--r--paludis/qa/keywords_check.hh2
-rw-r--r--paludis/qa/metadata_check.hh2
-rw-r--r--paludis/qa/package_dir_check.hh12
-rw-r--r--paludis/qa/package_name_check.hh2
-rw-r--r--paludis/qa/parse_deps_check.hh2
-rw-r--r--paludis/qa/pdepend_overlap_check.hh2
-rw-r--r--paludis/qa/rdepend_packages_check.hh2
-rw-r--r--paludis/qa/slot_check.hh2
25 files changed, 51 insertions, 34 deletions
diff --git a/paludis/qa/changelog_check.hh b/paludis/qa/changelog_check.hh
index 4de3fd0..fa91436 100644
--- a/paludis/qa/changelog_check.hh
+++ b/paludis/qa/changelog_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const FileCheckMaker::RegisterMaker register_changelog_check(
- ChangeLogCheck::identifier(), &make_file_check<ChangeLogCheck>);
+ ChangeLogCheck::identifier(), &MakeFileCheck<ChangeLogCheck>::make_file_check);
}
}
diff --git a/paludis/qa/create_metadata_check.hh b/paludis/qa/create_metadata_check.hh
index 9493939..632ce0c 100644
--- a/paludis/qa/create_metadata_check.hh
+++ b/paludis/qa/create_metadata_check.hh
@@ -49,7 +49,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_create_metadata_check(
- CreateMetadataCheck::identifier(), &make_ebuild_check<CreateMetadataCheck>);
+ CreateMetadataCheck::identifier(), &MakeEbuildCheck<CreateMetadataCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/dep_any_check.hh b/paludis/qa/dep_any_check.hh
index 45d1b1c..14d4405 100644
--- a/paludis/qa/dep_any_check.hh
+++ b/paludis/qa/dep_any_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_dep_any_check(
- DepAnyCheck::identifier(), &make_ebuild_check<DepAnyCheck>);
+ DepAnyCheck::identifier(), &MakeEbuildCheck<DepAnyCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/dep_flags_check.hh b/paludis/qa/dep_flags_check.hh
index c380302..6c92928 100644
--- a/paludis/qa/dep_flags_check.hh
+++ b/paludis/qa/dep_flags_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_dep_flags_check(
- DepFlagsCheck::identifier(), &make_ebuild_check<DepFlagsCheck>);
+ DepFlagsCheck::identifier(), &MakeEbuildCheck<DepFlagsCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/deps_exist_check.hh b/paludis/qa/deps_exist_check.hh
index 42ca983..e96e397 100644
--- a/paludis/qa/deps_exist_check.hh
+++ b/paludis/qa/deps_exist_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_deps_exist_check(
- DepsExistCheck::identifier(), &make_ebuild_check<DepsExistCheck>);
+ DepsExistCheck::identifier(), &MakeEbuildCheck<DepsExistCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/deps_visible_check.hh b/paludis/qa/deps_visible_check.hh
index 4874763..623fc3f 100644
--- a/paludis/qa/deps_visible_check.hh
+++ b/paludis/qa/deps_visible_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_deps_visible_check(
- DepsVisibleCheck::identifier(), &make_ebuild_check<DepsVisibleCheck>);
+ DepsVisibleCheck::identifier(), &MakeEbuildCheck<DepsVisibleCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/description_check.hh b/paludis/qa/description_check.hh
index 3e6e9ae..6f50139 100644
--- a/paludis/qa/description_check.hh
+++ b/paludis/qa/description_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_description_check(
- DescriptionCheck::identifier(), &make_ebuild_check<DescriptionCheck>);
+ DescriptionCheck::identifier(), &MakeEbuildCheck<DescriptionCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/ebuild_check.hh b/paludis/qa/ebuild_check.hh
index 010faeb..096b1c8 100644
--- a/paludis/qa/ebuild_check.hh
+++ b/paludis/qa/ebuild_check.hh
@@ -70,12 +70,16 @@ namespace paludis
NoSuchEbuildCheckTypeError(const std::string &) throw ();
};
+ /* icc stupidity workaround */
template <typename T_>
- EbuildCheck::Pointer
- make_ebuild_check()
+ struct MakeEbuildCheck
{
- return EbuildCheck::Pointer(new T_);
- }
+ static EbuildCheck::Pointer
+ make_ebuild_check()
+ {
+ return EbuildCheck::Pointer(new T_);
+ }
+ };
typedef VirtualConstructor<
std::string,
diff --git a/paludis/qa/file_check.hh b/paludis/qa/file_check.hh
index f1a9dac..9f235a3 100644
--- a/paludis/qa/file_check.hh
+++ b/paludis/qa/file_check.hh
@@ -60,18 +60,27 @@ namespace paludis
NoSuchFileCheckTypeError(const std::string &) throw ();
};
+ /* Do not turn this into a straight function. It makes icc cry. */
template <typename T_>
- FileCheck::Pointer
- make_file_check()
+ struct MakeFileCheck
{
- return FileCheck::Pointer(new T_);
- }
+ static FileCheck::Pointer make_file_check();
+ };
typedef VirtualConstructor<
std::string,
FileCheck::Pointer (*) (),
virtual_constructor_not_found::ThrowException<NoSuchFileCheckTypeError> > FileCheckMaker;
}
+
+}
+
+template <typename T_>
+paludis::qa::FileCheck::Pointer
+paludis::qa::MakeFileCheck<T_>::make_file_check()
+{
+ return paludis::qa::FileCheck::Pointer(new T_);
}
+
#endif
diff --git a/paludis/qa/file_name_check.hh b/paludis/qa/file_name_check.hh
index 3baa2c7..540c579 100644
--- a/paludis/qa/file_name_check.hh
+++ b/paludis/qa/file_name_check.hh
@@ -49,7 +49,7 @@ namespace paludis
};
static const FileCheckMaker::RegisterMaker register_file_name_check(
- FileNameCheck::identifier(), &make_file_check<FileNameCheck>);
+ FileNameCheck::identifier(), &MakeFileCheck<FileNameCheck>::make_file_check);
}
}
diff --git a/paludis/qa/file_permissions_check.hh b/paludis/qa/file_permissions_check.hh
index 756e67a..92e01a7 100644
--- a/paludis/qa/file_permissions_check.hh
+++ b/paludis/qa/file_permissions_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const FileCheckMaker::RegisterMaker register_file_permissions_check(
- FilePermissionsCheck::identifier(), &make_file_check<FilePermissionsCheck>);
+ FilePermissionsCheck::identifier(), &MakeFileCheck<FilePermissionsCheck>::make_file_check);
}
}
diff --git a/paludis/qa/files_dir_size_check.hh b/paludis/qa/files_dir_size_check.hh
index c342a4e..3b4c8d7 100644
--- a/paludis/qa/files_dir_size_check.hh
+++ b/paludis/qa/files_dir_size_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const PackageDirCheckMaker::RegisterMaker register_files_dir_size_check(
- FilesDirSizeCheck::identifier(), &make_package_dir_check<FilesDirSizeCheck>);
+ FilesDirSizeCheck::identifier(), &MakePackageDirCheck<FilesDirSizeCheck>::make_package_dir_check);
}
}
diff --git a/paludis/qa/glep_31_check.hh b/paludis/qa/glep_31_check.hh
index aeb040b..799ae26 100644
--- a/paludis/qa/glep_31_check.hh
+++ b/paludis/qa/glep_31_check.hh
@@ -47,7 +47,7 @@ namespace paludis
};
static const FileCheckMaker::RegisterMaker register_glep_31_check(
- Glep31Check::identifier(), &make_file_check<Glep31Check>);
+ Glep31Check::identifier(), &MakeFileCheck<Glep31Check>::make_file_check);
}
}
diff --git a/paludis/qa/has_ebuilds_check.hh b/paludis/qa/has_ebuilds_check.hh
index eb56403..fb9c157 100644
--- a/paludis/qa/has_ebuilds_check.hh
+++ b/paludis/qa/has_ebuilds_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const PackageDirCheckMaker::RegisterMaker register_has_ebuilds_check(
- HasEbuildsCheck::identifier(), &make_package_dir_check<HasEbuildsCheck>);
+ HasEbuildsCheck::identifier(), &MakePackageDirCheck<HasEbuildsCheck>::make_package_dir_check);
}
}
diff --git a/paludis/qa/has_misc_files_check.hh b/paludis/qa/has_misc_files_check.hh
index 99bbae6..2889e6c 100644
--- a/paludis/qa/has_misc_files_check.hh
+++ b/paludis/qa/has_misc_files_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const PackageDirCheckMaker::RegisterMaker register_misc_files_check(
- HasMiscFilesCheck::identifier(), &make_package_dir_check<HasMiscFilesCheck>);
+ HasMiscFilesCheck::identifier(), &MakePackageDirCheck<HasMiscFilesCheck>::make_package_dir_check);
}
}
diff --git a/paludis/qa/homepage_check.hh b/paludis/qa/homepage_check.hh
index 95fdfc8..d453287 100644
--- a/paludis/qa/homepage_check.hh
+++ b/paludis/qa/homepage_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_homepage_check(
- HomepageCheck::identifier(), &make_ebuild_check<HomepageCheck>);
+ HomepageCheck::identifier(), &MakeEbuildCheck<HomepageCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/keywords_check.cc b/paludis/qa/keywords_check.cc
index 64b1ea7..fb85d2f 100644
--- a/paludis/qa/keywords_check.cc
+++ b/paludis/qa/keywords_check.cc
@@ -47,7 +47,7 @@ KeywordsCheck::operator() (const EbuildCheckData & e) const
keywords.size() == 1)
result << Message(qal_major, "-* abuse");
}
- catch (const NameError & e)
+ catch (const NameError &)
{
result << Message(qal_major, "Bad entries in KEYWORDS");
}
diff --git a/paludis/qa/keywords_check.hh b/paludis/qa/keywords_check.hh
index 0468eb5..54aa444 100644
--- a/paludis/qa/keywords_check.hh
+++ b/paludis/qa/keywords_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_keywords_check(
- KeywordsCheck::identifier(), &make_ebuild_check<KeywordsCheck>);
+ KeywordsCheck::identifier(), &MakeEbuildCheck<KeywordsCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/metadata_check.hh b/paludis/qa/metadata_check.hh
index 3a1e7a3..87dfd79 100644
--- a/paludis/qa/metadata_check.hh
+++ b/paludis/qa/metadata_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const FileCheckMaker::RegisterMaker register_metadata_check(
- MetadataCheck::identifier(), &make_file_check<MetadataCheck>);
+ MetadataCheck::identifier(), &MakeFileCheck<MetadataCheck>::make_file_check);
}
}
diff --git a/paludis/qa/package_dir_check.hh b/paludis/qa/package_dir_check.hh
index 8baacef..30f690a 100644
--- a/paludis/qa/package_dir_check.hh
+++ b/paludis/qa/package_dir_check.hh
@@ -60,12 +60,16 @@ namespace paludis
NoSuchPackageDirCheckTypeError(const std::string &) throw ();
};
+ /* icc is dumb */
template <typename T_>
- PackageDirCheck::Pointer
- make_package_dir_check()
+ struct MakePackageDirCheck
{
- return PackageDirCheck::Pointer(new T_);
- }
+ static PackageDirCheck::Pointer
+ make_package_dir_check()
+ {
+ return PackageDirCheck::Pointer(new T_);
+ }
+ };
typedef VirtualConstructor<
std::string,
diff --git a/paludis/qa/package_name_check.hh b/paludis/qa/package_name_check.hh
index 8bcefde..9ce0c92 100644
--- a/paludis/qa/package_name_check.hh
+++ b/paludis/qa/package_name_check.hh
@@ -49,7 +49,7 @@ namespace paludis
};
static const PackageDirCheckMaker::RegisterMaker register_package_name_check(
- PackageNameCheck::identifier(), &make_package_dir_check<PackageNameCheck>);
+ PackageNameCheck::identifier(), &MakePackageDirCheck<PackageNameCheck>::make_package_dir_check);
}
}
diff --git a/paludis/qa/parse_deps_check.hh b/paludis/qa/parse_deps_check.hh
index 5cabf3e..ad00c6d 100644
--- a/paludis/qa/parse_deps_check.hh
+++ b/paludis/qa/parse_deps_check.hh
@@ -49,7 +49,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_parse_deps_check(
- ParseDepsCheck::identifier(), &make_ebuild_check<ParseDepsCheck>);
+ ParseDepsCheck::identifier(), &MakeEbuildCheck<ParseDepsCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/pdepend_overlap_check.hh b/paludis/qa/pdepend_overlap_check.hh
index 9a745c0..4ca8a7c 100644
--- a/paludis/qa/pdepend_overlap_check.hh
+++ b/paludis/qa/pdepend_overlap_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_pdepend_overlap_check(
- PdependOverlapCheck::identifier(), &make_ebuild_check<PdependOverlapCheck>);
+ PdependOverlapCheck::identifier(), &MakeEbuildCheck<PdependOverlapCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/rdepend_packages_check.hh b/paludis/qa/rdepend_packages_check.hh
index 05b7ab7..11f97dc 100644
--- a/paludis/qa/rdepend_packages_check.hh
+++ b/paludis/qa/rdepend_packages_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_rdepend_packages_check(
- RdependPackagesCheck::identifier(), &make_ebuild_check<RdependPackagesCheck>);
+ RdependPackagesCheck::identifier(), &MakeEbuildCheck<RdependPackagesCheck>::make_ebuild_check);
}
}
diff --git a/paludis/qa/slot_check.hh b/paludis/qa/slot_check.hh
index 89724db..ac8071e 100644
--- a/paludis/qa/slot_check.hh
+++ b/paludis/qa/slot_check.hh
@@ -44,7 +44,7 @@ namespace paludis
};
static const EbuildCheckMaker::RegisterMaker register_slot_check(
- SlotCheck::identifier(), &make_ebuild_check<SlotCheck>);
+ SlotCheck::identifier(), &MakeEbuildCheck<SlotCheck>::make_ebuild_check);
}
}