warning fixes

[flightgear.git] / src / ATCDCL / transmission.hxx

diff --git a/src/ATCDCL/transmission.hxx b/src/ATCDCL/transmission.hxx
index c1881b3c62fe1c8afe7e8d4667a4568782529cef..c8ee2ce10c8c37f808f45a8995e9841625541fc9 100644 (file)
--- a/src/ATCDCL/transmission.hxx
+++ b/src/ATCDCL/transmission.hxx
@@ -34,26 +34,10 @@
 
 #include <Main/fg_props.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#include <iomanip>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#elif defined( __BORLANDC__ )
-#  include <iostream>
-#else
-#  include <istream.h>
-#include <iomanip.h>
-#endif
 
 #include "ATC.hxx"
 
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-SG_USING_STD(istream);
-#endif
-
-SG_USING_STD(string);
-
 struct TransCode {
   int c1;
   int c2;
@@ -62,18 +46,18 @@ struct TransCode {
 
 // TransPar - a representation of the logic of a parsed speech transmission
 struct TransPar {
-  string  station;
-  string  callsign;
-  string  airport;
-  string  intention;      // landing, crossing
-  string  intid;          // (airport) ID for intention
+  std::string  station;
+  std::string  callsign;
+  std::string  airport;
+  std::string  intention;      // landing, crossing
+  std::string  intid;          // (airport) ID for intention
   bool    request;        // is the transmission a request or an answer?
   int     tdir;           // turning direction: 1=left, 2=right
   double  heading;
   int     VDir;           // vertical direction: 1=descent, 2=maintain, 3=climb
   double  alt;
   double  miles;
-  string  runway;
+  std::string  runway;
   double  freq;
   double  time;
 };
@@ -84,8 +68,8 @@ class FGTransmission {
   //int       StationType;    // Type of ATC station: 1 Approach
   atc_type  StationType;
   TransCode Code;           // DCL - no idea what this is.
-  string    TransText;      // The text of the spoken transmission
-  string    MenuText;       // An abbreviated version of the text for the menu entry
+  std::string    TransText;      // The text of the spoken transmission
+  std::string    MenuText;       // An abbreviated version of the text for the menu entry
 
 public:
 
@@ -96,21 +80,21 @@ public:
 
   inline atc_type  get_station()   const { return StationType; }
   inline const TransCode& get_code()      { return Code; }
-  inline const string&    get_transtext() { return TransText; }
-  inline const string&    get_menutext()  { return MenuText; }
+  inline const std::string&    get_transtext() { return TransText; }
+  inline const std::string&    get_menutext()  { return MenuText; }
 
   // Return the parsed logic of the transmission  
   TransPar Parse();
 
 private:
 
-  friend istream& operator>> ( istream&, FGTransmission& );
+  friend std::istream& operator>> ( std::istream&, FGTransmission& );
 
 };
 
 
-inline istream&
-operator >> ( istream& in, FGTransmission& a ) {
+inline std::istream&
+operator >> ( std::istream& in, FGTransmission& a ) {
        char ch;
        int tmp;