# HG changeset patch # User deba # Date 1110567258 0 # Node ID 39993ada11c70ce6e55324cac288786493e1b795 # Parent 6cc106135d3123847fd1b4882570fbd166633795 Changing exception names. Compile sentry fix. diff -r 6cc106135d31 -r 39993ada11c7 src/lemon/graph_reader.h --- a/src/lemon/graph_reader.h Fri Mar 11 16:44:20 2005 +0000 +++ b/src/lemon/graph_reader.h Fri Mar 11 18:54:18 2005 +0000 @@ -18,6 +18,9 @@ ///\file ///\brief Graph reader. +#ifndef LEMON_GRAPH_READER_H +#define LEMON_GRAPH_READER_H + #include #include @@ -28,13 +31,9 @@ #include -/// \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(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(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(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(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 diff -r 6cc106135d31 -r 39993ada11c7 src/lemon/graph_writer.h --- a/src/lemon/graph_writer.h Fri Mar 11 16:44:20 2005 +0000 +++ b/src/lemon/graph_writer.h Fri Mar 11 18:54:18 2005 +0000 @@ -18,6 +18,8 @@ ///\file ///\brief Graph writer. +#ifndef LEMON_GRAPH_WRITER_H +#define LEMON_GRAPH_WRITER_H #include #include @@ -28,6 +30,7 @@ #include #include + #include #include @@ -444,3 +447,5 @@ } + +#endif