X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmath%2Fsg_types.hxx;h=36a2a35a390be5f6d010504a6510ab083b5e52ce;hb=584ee1364f25e5c3795f9ff4633a792cba39bfc7;hp=0ffa2b76ba2fb155b32ff78eb9508192a2cbd405;hpb=dcb95d131bc6aef1abe25d1f415e309f06e52436;p=simgear.git diff --git a/simgear/math/sg_types.hxx b/simgear/math/sg_types.hxx index 0ffa2b76..36a2a35a 100644 --- a/simgear/math/sg_types.hxx +++ b/simgear/math/sg_types.hxx @@ -35,53 +35,23 @@ #include -#include STL_STRING +#include #include -#include - -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