From 3334e1ba2417fb726f52963270f1367fac45265c Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Tue, 27 Jan 2015 15:37:47 +0100 Subject: Adapted LoggableException to use the same code for obtaining the location of an object reference or pointer as the Logger class --- src/core/common/Exceptions.hpp | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) (limited to 'src/core/common/Exceptions.hpp') diff --git a/src/core/common/Exceptions.hpp b/src/core/common/Exceptions.hpp index 0be33b3..b63c32a 100644 --- a/src/core/common/Exceptions.hpp +++ b/src/core/common/Exceptions.hpp @@ -102,20 +102,6 @@ public: { } - /** - * Constructor of the LoggableException class. - * - * @param msg contains the error message. - * @param line is the line in the above file the message refers to. - * @param column is the column in the above file the message refers to. - * @param offs is the byte offset. - */ - LoggableException(std::string msg, int line, - int column, size_t offs) - : LoggableException(msg, SourceLocation(line, column, offs)) - { - } - /** * Constructor of LoggableException for arbitrary position objects. * @@ -123,20 +109,8 @@ public: * @param loc is a reference to a variable with location data. */ template - LoggableException(std::string msg, const LocationType &loc) - : LoggableException(std::move(msg), loc.getLocation()) - { - } - - /** - * Constructor of LoggableException for arbitrary position objects. - * - * @param msg is the actual log message. - * @param loc is a pointe to a variable with location data. - */ - template - LoggableException(std::string msg, const LocationType *loc) - : LoggableException(std::move(msg), loc->getLocation()) + LoggableException(std::string msg, LocationType loc) + : LoggableException(std::move(msg), SourceLocation::location(loc)) { } @@ -147,6 +121,7 @@ public: */ const SourceLocation& getLocation() const { return loc; } }; + } #endif /* _OUSIA_EXCEPTIONS_HPP_ */ -- cgit v1.2.3