fly/flightgear
1
0
Fork 0
Code Activity

Vassilii Khachaturov:

Browse source 
* in some cases more specific sg exception types were used in place
  of the more generic one, e.g., sg_io_exception instead of sg_exception
  when the context of the error was an IO error
* in some cases, the error message was made more specific
* minor style fix for exception rethrowing --- using throw; whenever
  a re-throw is made; sometimes optimizing away the exception symbol name
  in the catch handler at all
* more specific catch handlers added in some places -- e.g.,
  an sg_io_exception caught ahead of sg_exception
This commit is contained in:
ehofman 2005-12-11 13:37:06 +00:00
parent 04f7175fd0
commit 90a149ffa3
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ATC/AIMgr.cxx
View file

@ -82,7 +82,7 @@ void FGAIMgr::init() {
planepath.c_str(),
globals->get_props(),
globals->get_sim_time_sec() );
} catch(sg_exception& e) {
} catch(sg_exception&) {
_loadedDefaultOK = false;
}
@ -102,7 +102,7 @@ void FGAIMgr::init() {
planepath.c_str(),
globals->get_props(),
globals->get_sim_time_sec() );
} catch(sg_exception& e) {
} catch(sg_exception&) {
_havePiperModel = false;
}

2
src/Main/options.cxx
View file

@ -1063,7 +1063,7 @@ fgOptConfig( const char *arg )
readProperties(file, globals->get_props());
} catch (const sg_exception &e) {
string message = "Error loading config file: ";
message += e.getFormattedMessage();
message += e.getFormattedMessage() + e.getOrigin();
SG_LOG(SG_INPUT, SG_ALERT, message);
exit(2);
}

9
src/Scenery/tilemgr.cxx
View file

@ -323,8 +323,13 @@ void FGTileMgr::update_queues()
SGShadowVolume::occluderTypeTileObject,
(ssgBranch *) dm->get_tile()->get_terra_transform());
}
} catch (const sg_exception& exc) {
SG_LOG( SG_ALL, SG_ALERT, exc.getMessage() );
} catch (const sg_io_exception& exc) {
string m(exc.getMessage());
m += " ";
m += exc.getLocation().asString();
SG_LOG( SG_ALL, SG_ALERT, m );
} catch (const sg_exception& exc) { // XXX may be redundant
SG_LOG( SG_ALL, SG_ALERT, exc.getMessage());
}
dm->get_tile()->dec_pending_models();