Changeset 1213:6cc106135d31 in lemon-0.x for src

Timestamp:

03/11/05 17:44:20 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Solve conflict.

File:

• src/lemon/error.h (modified) (4 diffs)

src/lemon/error.h

@@ -325 +325 @@
   };
 
-  class IOLogicError : public IOError, public LogicError {
+  class IOParameterError : public LogicError {
   protected:
     ExceptionMember<std::string> _message;
     ExceptionMember<std::string> _file;
-    int _line;
 
     mutable ExceptionMember<std::string> _message_holder;
   public:
 
-    IOLogicError(const IOLogicError &ile) : 
-      IOError(ile), LogicError(ile), 
-      _message(ile._message), _file(ile._file) {}
-
-    ///\e 
-    explicit IOLogicError(const char *the_message)
-      : _message(the_message), _line(0) {}
-
-    ///\e 
-    IOLogicError(const char *file_name, const char *the_message)
+    IOParameterError(const IOParameterError &ile) : 
+      LogicError(ile), _message(ile._message), _file(ile._file) {}
+
+    ///\e 
+    explicit IOParameterError(const char *the_message)
+      : _message(the_message) {}
+
+    ///\e 
+    IOParameterError(const char *file_name, const char *the_message)
       : _message(file_name), _file(file_name) {}
 
@@ -385 +383 @@
 
     virtual const char* exceptionName() const {
-      return "lemon::IOLogicError";
-    }
-
-    virtual ~IOLogicError() throw() {}
+      return "lemon::IOParameterError";
+    }
+
+    virtual ~IOParameterError() throw() {}
   };
 
@@ -400 +398 @@
     const char *function;
     const char *message;
+
+    mutable ExceptionMember<std::string> _message_holder;
   public:
     ///\e
@@ -427 +427 @@
         ostr << message;
         if( assertion )
-          ostr << " (assertion '" << assertion << "' failed)";
+           ostr << " (assertion '" << assertion << "' failed)";
+        _message_holder.set(ostr.str());
         return ostr.str().c_str();
       }
       catch(...) {}
+      if( _message_holder.valid() ) return _message_holder.get().c_str();
       return exceptionName();
     }