aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-01-23 01:04:08 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-01-23 01:04:08 +0000
commit14c3a7d41a7ad442d80bc952d800b591020a27e9 (patch)
treed931e5b72f4e7bb8155e2c24bc45c1f1c1e20aac
parent300b879d72761d0d22e718f13b0b01c118769ed8 (diff)
downloadpaludis-14c3a7d41a7ad442d80bc952d800b591020a27e9.tar.gz
paludis-14c3a7d41a7ad442d80bc952d800b591020a27e9.tar.xz
Fixes for icc.
-rw-r--r--paludis/attributes.hh2
-rw-r--r--paludis/config_file_TEST.cc4
-rw-r--r--src/colour.hh2
3 files changed, 5 insertions, 3 deletions
diff --git a/paludis/attributes.hh b/paludis/attributes.hh
index 9a65655..8d77385 100644
--- a/paludis/attributes.hh
+++ b/paludis/attributes.hh
@@ -46,6 +46,8 @@
# define PALUDIS_CAN_USE_ATTRIBUTE 1
# define nothrow
# define deprecated
+# define noinline
+# define nonnull(...)
#else
# define PALUDIS_ATTRIBUTE(x)
#endif
diff --git a/paludis/config_file_TEST.cc b/paludis/config_file_TEST.cc
index 7fd8db4..e89aeed 100644
--- a/paludis/config_file_TEST.cc
+++ b/paludis/config_file_TEST.cc
@@ -114,12 +114,12 @@ namespace test_cases
FSEntry ff2("config_file_TEST_dir/not_a_config_file");
TEST_CHECK(! ff2.exists());
- TestFile * f2;
+ TestFile * f2(0);
TEST_CHECK_THROWS(f2 = new TestFile(ff2), ConfigFileError);
FSEntry ff3("config_file_TEST_dir/unreadable_file");
TEST_CHECK(ff3.is_regular_file());
- TestFile * f3;
+ TestFile * f3(0);
TEST_CHECK_THROWS(f3 = new TestFile(ff3), ConfigFileError);
}
} test_config_file_open_file;
diff --git a/src/colour.hh b/src/colour.hh
index cf6563b..e66d6ff 100644
--- a/src/colour.hh
+++ b/src/colour.hh
@@ -43,7 +43,7 @@ enum Colour
cl_masked = cl_flag_off
};
-bool use_colour() PALUDIS_ATTRIBUTE((nothrow,pure));
+bool use_colour() PALUDIS_ATTRIBUTE((pure));
template <typename T_>
std::string colour(Colour colour, const T_ & s)