aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-11-10 19:51:41 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-11-11 17:38:35 +0000
commitac97c0471e05d07efdb673bbef5665470bc4925a (patch)
tree581be014010be0cf56b6845d79ee8422fe74dc08
parentad5e8bbe4ebc5c5d7bb094caa0590b86d6c0603c (diff)
downloadpaludis-ac97c0471e05d07efdb673bbef5665470bc4925a.tar.gz
paludis-ac97c0471e05d07efdb673bbef5665470bc4925a.tar.xz
Make InternalError talk to stderr
-rw-r--r--paludis/util/exception.cc7
-rw-r--r--paludis/util/exception.hh12
2 files changed, 3 insertions, 16 deletions
diff --git a/paludis/util/exception.cc b/paludis/util/exception.cc
index 880e8ea..9cf78d3 100644
--- a/paludis/util/exception.cc
+++ b/paludis/util/exception.cc
@@ -23,6 +23,7 @@
#include <tr1/memory>
#include <list>
#include <cstdlib>
+#include <iostream>
#include "config.h"
@@ -128,11 +129,7 @@ NotAvailableError::NotAvailableError(const std::string & msg) throw () :
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 & location) throw () :
- Exception("Eek! Internal error at " + location)
-{
+ std::cerr << "Internal error at " << location << ": " << our_message << std::endl;
}
NameError::NameError(const std::string & name, const std::string & role) throw () :
diff --git a/paludis/util/exception.hh b/paludis/util/exception.hh
index f45c7ba..c8ca10e 100644
--- a/paludis/util/exception.hh
+++ b/paludis/util/exception.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -140,16 +140,6 @@ namespace paludis
* \param message A short message.
*/
InternalError(const std::string & location, const std::string & message) throw ();
-
- /**
- * Constructor, with no message (deprecated).
- *
- * \param location Should be set to the PALUDIS_HERE macro.
- *
- * \deprecated Use paludis::InternalError::InternalError(const char * const,
- * const std::string &) instead.
- */
- InternalError(const std::string & location) throw () PALUDIS_ATTRIBUTE((deprecated));
};
/**