include file change to make simgear work with OSG 2.9.X again

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

diff --git a/simgear/timing/geocoord.h b/simgear/timing/geocoord.h
index 0dc188c002eddcf09618d6cd8b9eb0fb790f5e6f..536cf0f95ca2fe7707d631d05636eb24e09d94bd 100644 (file)
--- a/simgear/timing/geocoord.h
+++ b/simgear/timing/geocoord.h
@@ -12,10 +12,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA  02111-1307, USA.
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  **************************************************************************/
 
@@ -37,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
@@ -67,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