From: James Turner Date: Mon, 17 Oct 2011 08:50:35 +0000 (+0100) Subject: std:: namespace fixes. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8cb716fe8e411a8cc8e4fe868e9718509754a673;p=simgear.git std:: namespace fixes. --- diff --git a/simgear/scene/tsync/terrasync.cxx b/simgear/scene/tsync/terrasync.cxx index 357390cc..0f99d4e5 100644 --- a/simgear/scene/tsync/terrasync.cxx +++ b/simgear/scene/tsync/terrasync.cxx @@ -86,6 +86,7 @@ #endif using namespace simgear; +using namespace std; const char* rsync_cmd = "rsync --verbose --archive --delete --perms --owner --group"; diff --git a/simgear/scene/tsync/terrasync.hxx b/simgear/scene/tsync/terrasync.hxx index 89ce5a7f..7e6e0cb1 100644 --- a/simgear/scene/tsync/terrasync.hxx +++ b/simgear/scene/tsync/terrasync.hxx @@ -54,7 +54,7 @@ protected: void syncAirportsModels(); void syncArea(int lat, int lon); void syncAreas(int lat, int lon, int lat_dir, int lon_dir); - void refreshScenery(SGPath path,const string& relativeDir); + void refreshScenery(SGPath path,const std::string& relativeDir); class SvnThread; diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx index 3a0b2979..f0c08eb2 100644 --- a/simgear/sound/soundmgr_openal.cxx +++ b/simgear/sound/soundmgr_openal.cxx @@ -47,6 +47,7 @@ #include using std::string; +using std::vector; extern bool isNaN(float *v);