X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmath%2Fsg_types.hxx;h=36a2a35a390be5f6d010504a6510ab083b5e52ce;hb=7a52c2fa71355631a559d74e0860fa6c5efa424e;hp=0a3454a48bbba948027dd3b4ed6f18804c3db307;hpb=2fb961c92289a696f0be05208e5fb067d0e46a87;p=simgear.git

diff --git a/simgear/math/sg_types.hxx b/simgear/math/sg_types.hxx
index 0a3454a4..36a2a35a 100644
--- a/simgear/math/sg_types.hxx
+++ b/simgear/math/sg_types.hxx
@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started March 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -17,10 +17,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.
 //
 // $Id$
 
@@ -29,60 +28,30 @@
 #define _SG_TYPES_HXX
 
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
+#endif
 
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
-#include <simgear/math/point3d.hxx>
-
-SG_USING_STD(vector);
-SG_USING_STD(string);
-
 /** STL vector list of ints */
-typedef vector < int > int_list;
+typedef std::vector < int > int_list;
 typedef int_list::iterator int_list_iterator;
 typedef int_list::const_iterator const_int_list_iterator;
 
 /** STL vector list of doubles */
-typedef vector < double > double_list;
+typedef std::vector < double > double_list;
 typedef double_list::iterator double_list_iterator;
 typedef double_list::const_iterator const_double_list_iterator;
 
-/** STL vector list of Point3D */
-typedef vector < Point3D > point_list;
-typedef point_list::iterator point_list_iterator;
-typedef point_list::const_iterator const_point_list_iterator;
-
 /** STL vector list of strings */
-typedef vector < string > string_list;
+typedef std::vector < std::string > string_list;
 typedef string_list::iterator string_list_iterator;
 typedef string_list::const_iterator const_string_list_iterator;
 
-
-/**
- * Simple 2d point class where members can be accessed as x, dist, or lon
- * and y, theta, or lat
- */
-class point2d {
-public:
-    union {
-	double x;
-	double dist;
-	double lon;
-    };
-    union {
-	double y;
-	double theta;
-	double lat;
-    };
-};
-
-
 #endif // _SG_TYPES_HXX