Changeset 1157:3996d2098090 in lemon-0.x for src

Timestamp:

02/19/05 22:11:20 (20 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

lemon/error.h: boost::shared_ptr helyett std::auto_ptr

(Sokkal kenylemetlenebb, es nem teljesen biztos, hogy helyes megoldas)

Location:

src

Files:

• lemon/error.h (modified) (10 diffs)
• work/klao/error2_test.cc (added)

src/lemon/error.h

@@ -1 +1 @@
 /* -*- C++ -*-
+ *
  * src/lemon/error.h - Part of LEMON, a generic C++ optimization library
  *
- * Copyright (C) 2004 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
- * (Egervary Combinatorial Optimization Research Group, EGRES).
+ * Copyright (C) 2004 Egervary Jeno Kombinatorikus Optimalizalasi
+ * Kutatocsoport (Egervary Combinatorial Optimization Research Group,
+ * EGRES).
  *
  * Permission to use, modify and distribute this software is granted
@@ -27 +29 @@
 #include <iostream>
 #include <cstdlib>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace lemon {
@@ -43 +44 @@
   protected:
     ///\e 
-    boost::shared_ptr<std::ostringstream> buf;
+    ///\todo The good solution is boost:shared_ptr...
+    mutable
+    std::auto_ptr<std::ostringstream> buf;
     
     ///\e 
@@ -53 +56 @@
         buf.reset();
       }
-      return buf;
+      return buf.get();
     }
 
@@ -60 +63 @@
     ///\e 
     ErrorMessage() throw() { init(); }
+
+    ErrorMessage(const ErrorMessage& em) throw() : buf(em.buf) { }
 
     ///\e 
@@ -76 +81 @@
     template <typename T>
     ErrorMessage& operator<<(const T &t) throw() {
-      if( !buf ) return *this;
+      if( ! buf.get() ) return *this;
 
       try {
@@ -88 +93 @@
     ///\e 
     const char* message() throw() {
-      if( !buf ) return 0;
+      if( ! buf.get() ) return 0;
 
       const char* mes = 0;
@@ -188 +193 @@
     const char *_message;
     int _line;
-    boost::shared_ptr<std::string> _file;
-
-  public:
+
+    ///\todo Much better solution is boost::shared_ptr
+    mutable
+    std::auto_ptr<std::string> _file;
+
+  public:
+
+    DataFormatError(const DataFormatError &dfe) : 
+      IOError(dfe), _message(dfe._message), _line(dfe._line),
+      _file(dfe._file) {}
+
     ///\e 
     explicit DataFormatError(const char *the_message)
@@ -223 +236 @@
     /// Returns \e "(unknown)" if the filename was not specified.
     const char* file() const {
-      if( _file )
+      if( _file.get() )
         return _file->c_str();
       else
@@ -235 +248 @@
         std::ostringstream ostr;
         ostr << _message;
-        if( _file || _line ) {
+        if( _file.get() || _line ) {
           ostr << " (";
-          if( _file ) ostr << "in file '" << *_file << "'";
-          if( _file && _line ) ostr << " ";
+          if( _file.get() ) ostr << "in file '" << *_file << "'";
+          if( _file.get() && _line ) ostr << " ";
           if( _line ) ostr << "at line " << _line;
           ostr << ")";