Changeset 2151:38ec4a930c05 in lemon-0.x for lemon/error.h

Timestamp:

07/18/06 15:29:59 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2865

Message:

exceptionName() has been thrown away

File:

• lemon/error.h (modified) (12 diffs)

lemon/error.h

@@ -177 +177 @@
     ///\e 
     virtual ~Exception() throw() {}
-
-    ///\e
-    virtual const char* exceptionName() const {
+    ///\e 
+    virtual const char* what() const throw() {
       return "lemon::Exception";
-    }
-    
-    ///\e 
-    virtual const char* what() const throw() {
-      return exceptionName();
     }
   };
@@ -200 +194 @@
   class LogicError : public Exception {
   public:
-    virtual const char* exceptionName() const {
+    virtual const char* what() const throw() {
       return "lemon::LogicError";
     }
@@ -213 +207 @@
   class UninitializedParameter : public LogicError {
   public:
-    virtual const char* exceptionName() const {
+    virtual const char* what() const throw() {
       return "lemon::UninitializedParameter";
     }
@@ -228 +222 @@
   class RuntimeError : public Exception {
   public:
-    virtual const char* exceptionName() const {
+    virtual const char* what() const throw() {
       return "lemon::RuntimeError";
     }
@@ -236 +230 @@
   class RangeError : public RuntimeError {
   public:
-    virtual const char* exceptionName() const {
+    virtual const char* what() const throw() {
       return "lemon::RangeError";
     }
@@ -244 +238 @@
   class IOError : public RuntimeError {
   public:
-    virtual const char* exceptionName() const {
+    virtual const char* what() const throw() {
       return "lemon::IOError";
     }
@@ -305 +299 @@
       try {
         std::ostringstream ostr;
-        ostr << exceptionName() << ": ";
+        ostr << "lemon:DataFormatError" << ": ";
         if (message()) ostr << message();
         if( file() || line() != 0 ) {
@@ -318 +312 @@
       catch (...) {}
       if( _message_holder.valid()) return _message_holder.get().c_str();
-      return exceptionName();
-    }
-
-    virtual const char* exceptionName() const {
-      return "lemon::DataFormatError";
+      return "lemon:DataFormatError";
     }
 
@@ -362 +352 @@
       try {
         std::ostringstream ostr;
-        ostr << exceptionName() << ": ";
+        ostr << "lemon::FileOpenError" << ": ";
         ostr << "Cannot open file - " << file();
         _message_holder.set(ostr.str());
@@ -368 +358 @@
       catch (...) {}
       if( _message_holder.valid()) return _message_holder.get().c_str();
-      return exceptionName();
-    }
-
-    virtual const char* exceptionName() const {
       return "lemon::FileOpenError";
     }
-
     virtual ~FileOpenError() throw() {}
   };
@@ -432 +417 @@
       catch (...) {}
       if( _message_holder.valid() ) return _message_holder.get().c_str();
-      return exceptionName();
-    }
-
-    virtual const char* exceptionName() const {
-      return "lemon::IOParameterError";
-    }
-
+      return "lemon:IOParameterError";
+    }
     virtual ~IOParameterError() throw() {}
   };
@@ -486 +466 @@
       catch(...) {}
       if( _message_holder.valid() ) return _message_holder.get().c_str();
-      return exceptionName();
-    }
-
-    virtual const char* exceptionName() const {
       return "lemon::AssertionFailedError";
     }
-
-    virtual ~AssertionFailedError() throw() {}
+   virtual ~AssertionFailedError() throw() {}
   };