[Lemon-commits] [lemon_svn] deba: r1634 - hugo/trunk/src/lemon

[Lemon SVN]

Author: deba
Date: Fri Mar 11 19:54:18 2005
New Revision: 1634

Modified:
   hugo/trunk/src/lemon/graph_reader.h
   hugo/trunk/src/lemon/graph_writer.h

Log:
Changing exception names.
Compile sentry fix.


Modified: hugo/trunk/src/lemon/graph_reader.h
==============================================================================
--- hugo/trunk/src/lemon/graph_reader.h	(original)
+++ hugo/trunk/src/lemon/graph_reader.h	Fri Mar 11 19:54:18 2005
@@ -18,6 +18,9 @@
 ///\file
 ///\brief Graph reader.
 
+#ifndef LEMON_GRAPH_READER_H
+#define LEMON_GRAPH_READER_H
+
 #include <iostream>
 #include <sstream>
 
@@ -28,13 +31,9 @@
 
 #include <lemon/error.h>
 
-/// \todo fix exceptions
-
 
 namespace lemon {
 
-  // Exceptions
-
 
   /// \brief Standard ReaderTraits for the GraphReader class.
   ///
@@ -229,7 +228,7 @@
       if (node_map_readers.find(name) != node_map_readers.end()) {
 	ErrorMessage msg;
 	msg << "Multiple read rule for node map: " << name;
-	throw IOLogicError(msg.message());
+	throw IOParameterError(msg.message());
       }
       node_map_readers.insert(
         make_pair(name, new MapReader<Node, Map, Reader>(map, reader)));
@@ -245,7 +244,7 @@
       if (node_map_readers.find(name) != node_map_readers.end()) {
 	ErrorMessage msg;
 	msg << "Multiple read rule for node map: " << name;
-	throw IOLogicError(msg.message());
+	throw IOParameterError(msg.message());
       }
       node_map_readers.insert(
         make_pair(name, new SkipReader<Node, Reader>(reader)));
@@ -271,7 +270,7 @@
       if (edge_map_readers.find(name) != edge_map_readers.end()) {
 	ErrorMessage msg;
 	msg << "Multiple read rule for edge map: " << name;
-	throw IOLogicError(msg.message());
+	throw IOParameterError(msg.message());
       }
       edge_map_readers.insert(
         make_pair(name, new MapReader<Edge, Map, Reader>(map, reader)));
@@ -287,7 +286,7 @@
       if (edge_map_readers.find(name) != edge_map_readers.end()) {
 	ErrorMessage msg;
 	msg << "Multiple read rule for edge map: " << name;
-	throw IOLogicError(msg.message());
+	throw IOParameterError(msg.message());
       }
       edge_map_readers.insert(
         make_pair(name, new SkipReader<Edge, Reader>(reader)));
@@ -301,7 +300,7 @@
       if (node_readers.find(name) != node_readers.end()) {
 	ErrorMessage msg;
 	msg << "Multiple read rule for node: " << name;
-	throw IOLogicError(msg.message());
+	throw IOParameterError(msg.message());
       }
       node_readers.insert(make_pair(name, &node));
       return *this;
@@ -314,7 +313,7 @@
       if (edge_readers.find(name) != edge_readers.end()) {
 	ErrorMessage msg;
 	msg << "Multiple read rule for edge: " << name;
-	throw IOLogicError(msg.message());
+	throw IOParameterError(msg.message());
       }
       edge_readers.insert(make_pair(name, &edge));
       return *this;
@@ -693,3 +692,5 @@
   }
 
 }
+
+#endif

Modified: hugo/trunk/src/lemon/graph_writer.h
==============================================================================
--- hugo/trunk/src/lemon/graph_writer.h	(original)
+++ hugo/trunk/src/lemon/graph_writer.h	Fri Mar 11 19:54:18 2005
@@ -18,6 +18,8 @@
 ///\file
 ///\brief Graph writer.
 
+#ifndef LEMON_GRAPH_WRITER_H
+#define LEMON_GRAPH_WRITER_H
 
 #include <iostream>
 #include <sstream>
@@ -28,6 +30,7 @@
 #include <memory>
 
 #include <lemon/map_utils.h>
+
 #include <lemon/invalid.h>
 #include <lemon/error.h>
 
@@ -444,3 +447,5 @@
 
 
 }
+
+#endif