X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Froute.cpp;h=be2eefc258ea8cfc7e135932e9ab325c1611ee96;hb=66c2c7ca5a4bd369293959bc211b040834343381;hp=aabe8807b71cd4b7d92927ca6427edce21f804d1;hpb=a20b8421d002629a9f4d97c0c378e9f9cb29e292;p=r2c2.git

diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp
index aabe880..be2eefc 100644
--- a/source/libr2c2/route.cpp
+++ b/source/libr2c2/route.cpp
@@ -169,10 +169,10 @@ void Route::set_temporary(bool t)
 void Route::set_turnout(unsigned addr, unsigned path)
 {
 	if(!addr)
-		throw InvalidParameterValue("Invalid turnout address");
+		throw invalid_argument("Route::set_turnout");
 	int &state = get_item(turnouts, addr);
 	if(state>=0 && path!=static_cast<unsigned>(state))
-		throw InvalidState("Setting conflicts with route");
+		throw logic_error("route conflict");
 	state = path;
 }
 
@@ -419,7 +419,7 @@ Route *Route::find(const TrackIter &from, const set<Track *> &to)
 
 
 Route::Loader::Loader(Route &r):
-	DataFile::BasicLoader<Route>(r)
+	DataFile::ObjectLoader<Route>(r)
 {
 	add("name",    &Route::name);
 	add("turnout", &Loader::turnout);