Merge branch 'fredb/winfix'

[simgear.git] / simgear / timing / geocoord.h

diff --git a/simgear/timing/geocoord.h b/simgear/timing/geocoord.h
index dbea68c253bab9ce728c0af395daae9f8866a27e..536cf0f95ca2fe7707d631d05636eb24e09d94bd 100644 (file)
--- a/simgear/timing/geocoord.h
+++ b/simgear/timing/geocoord.h
@@ -36,14 +36,8 @@
 
 
 #include <math.h>
-#include <string>
-#include STL_IOSTREAM
-//#include <streambuf> // looks like streambuf does not exist on linux.
-// But it looks like it isn't used anyways -:)
 #include <vector>
 
-SG_USING_NAMESPACE(std);
-
 #include <simgear/constants.h>
 
 class SGGeoCoord
@@ -66,14 +60,12 @@ public:
   float getZ()   const { return sin(SGD_DEGREES_TO_RADIANS*lat); };
 
 
-  //double getAngle(const SGGeoCoord& other) const;
-  virtual void print() {} ; 
   virtual const char * getDescription() {return 0;};
 };
 
-typedef vector<SGGeoCoord*> SGGeoCoordVector;
-typedef vector<SGGeoCoord*>::iterator SGGeoCoordVectorIterator;
-typedef vector<SGGeoCoord*>::const_iterator SGGeoCoordVectorConstIterator;
+typedef std::vector<SGGeoCoord*> SGGeoCoordVector;
+typedef std::vector<SGGeoCoord*>::iterator SGGeoCoordVectorIterator;
+typedef std::vector<SGGeoCoord*>::const_iterator SGGeoCoordVectorConstIterator;
 
 /************************************************************************
  * SGGeoCoordContainer is a simple container class, that stores objects