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;
}
Route::Loader::Loader(Route &r):
- DataFile::BasicLoader<Route>(r)
+ DataFile::ObjectLoader<Route>(r)
{
add("name", &Route::name);
add("turnout", &Loader::turnout);