Reset: work with threaded OSG modes

[flightgear.git] / src / FDM / UIUCModel / uiuc_warnings_errors.cpp

diff --git a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
index 02d6f8c4a9ce463a7361c2948147614ddaea6233..50866ad1450fcdb101aed5af2f0916ea3a511085 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
+++ b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
@@ -11,9 +11,9 @@ Prints to screen the follow:
 - Error Code (errorCode)
 
 - Message indicating the problem. This message should be preceded by
-"Warning", "Error" or "Note".  Warnings are non-fatal and the code
-will pause.  Errors are fatal and will stop the code.  Notes are only
-for information.
+  "Warning", "Error" or "Note".  Warnings are non-fatal and the code
+  will pause.  Errors are fatal and will stop the code.  Notes are
+  only for information.
  
 
 ----------------------------------------------------------------------
@@ -70,24 +70,22 @@ for information.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA or view http://www.gnu.org/copyleft/gpl.html.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 **********************************************************************/
-#include <stdlib.h>
-#include <string.h>
-#include <cstdlib>             // exit
+
+#include <iostream>
 
 #include "uiuc_warnings_errors.h"
 
-SG_USING_STD (cerr);
-SG_USING_STD (endl);
+using std::cerr;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD (exit);
+using std::exit;
 #endif
 
-void uiuc_warnings_errors(int errorCode, string line)
+void uiuc_warnings_errors(int errorCode, std::string line)
 {
   switch (errorCode)
     {
@@ -96,7 +94,7 @@ void uiuc_warnings_errors(int errorCode, string line)
       exit(-1);
       break;
     case 2:
-      cerr << "UIUC ERROR 2: Unknown identifier in \"" << line << "\" (check uiuc_maps_*.cpp)" << endl;
+      cerr << "UIUC ERROR 2: Unknown identifier in \"" << line << "\" (check uiuc_map_*.cpp)" << endl;
       exit(-1);
       break;
     case 3:
@@ -111,6 +109,14 @@ void uiuc_warnings_errors(int errorCode, string line)
       cerr << "UIUC ERROR 5: Must use dyn_on_speed not equal to zero: \"" << line << endl;
       exit(-1);
       break;
+    case 6:
+      cerr << "UIUC ERROR 6: Table lookup data exceeds 99 point limit: \"" << endl;
+      exit(-1);
+      break;
+    case 7:
+      cerr << "UIUC ERROR 7: Need to download data file for the ornithopter.  Go to http://www.aae.uiuc.edu/m-selig/apasim/Aircraft-uiuc.html " << endl;
+      exit(-1);
+      break;
     }
 }