aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-19 00:32:59 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-19 00:32:59 +0000
commit33a29f0c274db67d2b8ccba6b701844743a0d2c9 (patch)
tree762d78cb3961c9a98779df21aaa6e66595dc6f99
parent5a16b8056d74fac0b47221717745aa81ec6631b7 (diff)
downloadpaludis-33a29f0c274db67d2b8ccba6b701844743a0d2c9.tar.gz
paludis-33a29f0c274db67d2b8ccba6b701844743a0d2c9.tar.xz
Avoid using 'where' as an identifier name
-rw-r--r--paludis/util/exception.cc8
-rw-r--r--paludis/util/exception.hh4
2 files changed, 6 insertions, 6 deletions
diff --git a/paludis/util/exception.cc b/paludis/util/exception.cc
index 2ef57b5..48177d7 100644
--- a/paludis/util/exception.cc
+++ b/paludis/util/exception.cc
@@ -105,13 +105,13 @@ NotAvailableError::NotAvailableError(const std::string & msg) throw () :
{
}
-InternalError::InternalError(const std::string & where, const std::string & our_message) throw () :
- Exception("Eek! Internal error at " + where + ": " + our_message)
+InternalError::InternalError(const std::string & location, const std::string & our_message) throw () :
+ Exception("Eek! Internal error at " + location + ": " + our_message)
{
}
-InternalError::InternalError(const std::string & where) throw () :
- Exception("Eek! Internal error at " + where)
+InternalError::InternalError(const std::string & location) throw () :
+ Exception("Eek! Internal error at " + location)
{
}
diff --git a/paludis/util/exception.hh b/paludis/util/exception.hh
index c7eb1cb..13614c8 100644
--- a/paludis/util/exception.hh
+++ b/paludis/util/exception.hh
@@ -139,7 +139,7 @@ namespace paludis
*
* \param message A short message.
*/
- InternalError(const std::string & where, const std::string & message) throw ();
+ InternalError(const std::string & location, const std::string & message) throw ();
/**
* Constructor, with no message (deprecated).
@@ -149,7 +149,7 @@ namespace paludis
* \deprecated Use paludis::InternalError::InternalError(const char * const,
* const std::string &) instead.
*/
- InternalError(const std::string & where) throw () PALUDIS_ATTRIBUTE((deprecated));
+ InternalError(const std::string & location) throw () PALUDIS_ATTRIBUTE((deprecated));
};
/**