X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscene%2Ftgdb%2FTileEntry.cxx;h=64f9c3e0cb6021ecbc06b994d4d9b910f3b0b783;hb=d4c7e950927b1e19a7a7622a7919f32233a6b7a8;hp=ea0c73e401f0ed68396207dff02cf10c5efe3111;hpb=373a0e4a7d59c3f8ed1d66ff6145de61ecd46279;p=simgear.git diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx index ea0c73e4..64f9c3e0 100644 --- a/simgear/scene/tgdb/TileEntry.cxx +++ b/simgear/scene/tgdb/TileEntry.cxx @@ -25,8 +25,9 @@ #include #include -#include STL_STRING +#include #include +#include #include #include @@ -61,7 +62,7 @@ #include "ReaderWriterSTG.hxx" #include "TileEntry.hxx" -SG_USING_STD(string); +using std::string; using namespace simgear; ModelLoadHelper *TileEntry::_modelLoader=0; @@ -252,7 +253,8 @@ typedef enum { // storage class for deferred object processing in TileEntry::load() struct Object { - Object(object_type t, const string& token, const SGPath& p, istream& in) + Object(object_type t, const string& token, const SGPath& p, + std::istream& in) : type(t), path(p) { in >> name;