// 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
// 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$
#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>
+class Point3D;
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
/** STL vector list of ints */
typedef 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 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 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