FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final fixes for SG_USING_STD removal

Browse Source
This commit is contained in:
ehofman
2008-07-29 08:25:17 +00:00
parent cf19b81dd4
commit 426f6de16f
5 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/compiler.h
-5
View File
@@ -141,10 +141,5 @@ inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
// No user modifiable definitions beyond here.
//
/** \def SG_USING_STD(x)
* Expands to using std::X
*/
# define SG_USING_STD(X) using std::X
#endif // _SG_COMPILER_H
simgear/io/sg_binobj.cxx
+2 -3
View File
@@ -43,9 +43,8 @@
#include "sg_binobj.hxx"
SG_USING_STD( string );
SG_USING_STD( vector );
using std::string;
using std::vector;
using std::cout;
using std::endl;
simgear/props/props.cxx
+3 -3
View File
@@ -23,9 +23,9 @@
#if ( _MSC_VER == 1200 )
// MSVC 6 is buggy, and needs something strange here
SG_USING_STD(vector<SGPropertyNode_ptr>);
SG_USING_STD(vector<SGPropertyChangeListener *>);
SG_USING_STD(vector<SGPropertyNode *>);
using std::vector<SGPropertyNode_ptr>;
using std::vector<SGPropertyChangeListener *>;
using std::vector<SGPropertyNode *>;
#endif
#endif
simgear/sound/sample_openal.hxx
+1 -1
View File
@@ -63,7 +63,7 @@
#define USE_SOFTWARE_DOPPLER seem to be necessary
#endif
SG_USING_STD(string);
using std::string;
/**
* manages everything we need to know for an individual sound sample
simgear/structure/subsystem_mgr.hxx
+4 -3
View File
@@ -28,9 +28,10 @@
#include <string>
#include <map>
#include <vector>
SG_USING_STD(map);
SG_USING_STD(vector);
SG_USING_STD(string);
using std::map;
using std::vector;
using std::string;
#include <simgear/props/props.hxx>
#include <simgear/timing/timestamp.hxx>