[Lemon-commits] [lemon_svn] klao: r648 - in hugo/trunk/src: include test

[Lemon SVN]

Author: klao
Date: Fri Apr 30 01:24:42 2004
New Revision: 648

Modified:
   hugo/trunk/src/include/error.h
   hugo/trunk/src/test/makefile

Log:
The -W gcc option _does_ matter even if you use -Wall!
Minor changes.


Modified: hugo/trunk/src/include/error.h
==============================================================================
--- hugo/trunk/src/include/error.h	(original)
+++ hugo/trunk/src/include/error.h	Fri Apr 30 01:24:42 2004
@@ -6,6 +6,7 @@
 //! \file
 //! \brief Basic error handling (signaling) routines.
 
+#include <exception>
 #include <string>
 #include <sstream>
 
@@ -27,7 +28,9 @@
   public:
     Exception() {}
     explicit Exception(const std::string &s) { buf << s; }
-    Exception(const Exception &e) { buf << e.buf.str(); }
+    Exception(const Exception &e) : std::exception() {
+      buf << e.buf.str();
+    }
     virtual ~Exception() throw() {}
     
     virtual const char* what() const throw() {
@@ -56,8 +59,8 @@
    */
 
 # define FIXME(msg) \
-    do { throw ::hugo::Exception("FIXME: " msg) << " (in: "    \
-      << __FILE__ << ", " << __LINE__ << ")";                  \
+    do { throw ::hugo::Exception() << "FIXME: " msg " (in: "    \
+      __FILE__ ", " << __LINE__ << ")";                         \
     } while(false)
 
 }

Modified: hugo/trunk/src/test/makefile
==============================================================================
--- hugo/trunk/src/test/makefile	(original)
+++ hugo/trunk/src/test/makefile	Fri Apr 30 01:24:42 2004
@@ -1,5 +1,5 @@
 INCLUDEDIRS ?= -I../include
-CXXFLAGS += -Wall -O3 -ansi -pedantic $(INCLUDEDIRS) 
+CXXFLAGS += -W -Wall -O3 -ansi -pedantic $(INCLUDEDIRS) 
 #LEDAROOT ?= /ledasrc/LEDA-4.1
 
 BINARIES = dijkstra_heap_test unionfind_test error_test