- remove evil exit()

- remove "enabled". It's unused, and that's a good thing: it wasn't
  initialized.

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index bf0bce8ed928207d222b843c7e59ffe6ec7134df..126faa19f4c3ecf369fb488d7d2640d42e39c428 100644 (file)
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -64,16 +64,10 @@ FGInstrumentMgr::FGInstrumentMgr ()
         try {
             readProperties( config.str(), config_props );
 
-            if ( build() ) {
-                enabled = true;
-            } else {
-                SG_LOG( SG_ALL, SG_ALERT,
-                        "Detected an internal inconsistency in the instrumentation");
-                SG_LOG( SG_ALL, SG_ALERT,
-                        " system specification file.  See earlier errors for" );
-                SG_LOG( SG_ALL, SG_ALERT,
-                        " details.");
-                exit(-1);
+            if ( !build() ) {
+                throw sg_throwable(string(
+                        "Detected an internal inconsistency in the instrumentation\n"
+                        "system specification file.  See earlier errors for details."));
             }
         } catch (const sg_exception& exc) {
             SG_LOG( SG_ALL, SG_ALERT, "Failed to load instrumentation system model: "

diff --git a/src/Instrumentation/instrument_mgr.hxx b/src/Instrumentation/instrument_mgr.hxx
index 88a9c8bed656fd7a0a2dddd51103869aa9f8c524..0d0069733b7bb1bd00e91080b8799b46bd9afe99 100644 (file)
--- a/src/Instrumentation/instrument_mgr.hxx
+++ b/src/Instrumentation/instrument_mgr.hxx
@@ -35,8 +35,6 @@ public:
 
 private:
     SGPropertyNode *config_props;
-    bool enabled;
-
 };
 
 #endif // __INSTRUMENT_MGR_HXX