From a2acc953ae337d45954382904e0d1ea6c63b48a0 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 18 Mar 2002 19:46:24 +0000
Subject: [PATCH] Somewhere along the line in the recent changes some std::cout
 were inclueded in some of the files. Irix doesn't have cout in the std class,
 so I changed it to "cout" and included SG_USING_NAMESPACE(std) at the
 beginning of the files. And some minor warning cleanups.

---
 src/FDM/LaRCsimIC.hxx  | 4 ++--
 src/Main/fg_io.cxx     | 3 ++-
 src/Network/garmin.cxx | 3 ++-
 src/Network/nmea.cxx   | 4 +++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/FDM/LaRCsimIC.hxx b/src/FDM/LaRCsimIC.hxx
index d5a38870b..7f2bb0d85 100644
--- a/src/FDM/LaRCsimIC.hxx
+++ b/src/FDM/LaRCsimIC.hxx
@@ -44,8 +44,8 @@ CLASS DECLARATION
 #define DEFAULT_AGL_ALT 3.758099
 #define DEFAULT_PITCH_ON_GROUND 0.0074002
 
-typedef enum lsspeedset { lssetvt, lssetvc, lssetve, lssetmach, lssetuvw, lssetned };
-typedef enum lsaltset { lssetasl, lssetagl };
+enum lsspeedset { lssetvt, lssetvc, lssetve, lssetmach, lssetuvw, lssetned };
+enum lsaltset { lssetasl, lssetagl };
 
 
 class LaRCsimIC {
diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 9bfff40d2..d98cc0769 100644
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -57,6 +57,7 @@
 
 #include "globals.hxx"
 
+SG_USING_NAMESPACE(std);
 SG_USING_STD(string);
 
 
@@ -90,7 +91,7 @@ static FGProtocol *parse_port_config( const string& config )
 	FGATC610x *atc610x = new FGATC610x;
 	io = atc610x;
         short_circuit = true;
-	std::cout << "here ..." << endl;
+	cout << "here ..." << endl;
     } else if ( protocol == "atlas" ) {
 	FGAtlas *atlas = new FGAtlas;
 	io = atlas;
diff --git a/src/Network/garmin.cxx b/src/Network/garmin.cxx
index 877baca1b..590a92fda 100644
--- a/src/Network/garmin.cxx
+++ b/src/Network/garmin.cxx
@@ -31,6 +31,7 @@
 
 #include "garmin.hxx"
 
+SG_USING_NAMESPACE(std);
 
 FGGarmin::FGGarmin() {
 }
@@ -145,7 +146,7 @@ bool FGGarmin::gen_message() {
     garmin_sentence += rmz_sum;
     garmin_sentence += "\n";
 
-    std::cout << garmin_sentence;
+    cout << garmin_sentence;
 
     length = garmin_sentence.length();
     strncpy( buf, garmin_sentence.c_str(), length );
diff --git a/src/Network/nmea.cxx b/src/Network/nmea.cxx
index 8bb63ee41..577e694cc 100644
--- a/src/Network/nmea.cxx
+++ b/src/Network/nmea.cxx
@@ -31,6 +31,8 @@
 
 #include "nmea.hxx"
 
+SG_USING_NAMESPACE(std);
+
 
 FGNMEA::FGNMEA() {
 }
@@ -145,7 +147,7 @@ bool FGNMEA::gen_message() {
     nmea_sentence += gga_sum;
     nmea_sentence += "\n";
 
-    std::cout << nmea_sentence;
+    cout << nmea_sentence;
 
     length = nmea_sentence.length();
     strncpy( buf, nmea_sentence.c_str(), length );