Name space changes.

diff --git a/SimGear.dsp b/SimGear.dsp
index a4529ea4c1c47aab716e1ce2f171310ffe651549..8277fb928305d1a4291b148dac222be6c25e5ecd 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -39,10 +39,9 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I ".\src" /I ".\src\Include" /I "\usr\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /D "FGFS" /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I ".\src" /I ".\src\Include" /I "\usr\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"\r
 # ADD RSC /l 0xc09 /d "NDEBUG"\r
@@ -51,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib glut32.lib wsock32.lib simgear.lib fnt.lib pui.lib sg.lib sl.lib ssg.lib ul.lib mk4vc60_d.lib /nologo /subsystem:console /machine:I386 /libpath:"\usr\lib" /libpath:"\usr\lib\simgear" /libpath:"\usr\lib\plib\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
@@ -67,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".\src" /I ".\src\Include" /I "\usr\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /D "FGFS" /FR /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".\src" /I ".\src\Include" /I "\usr\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /FR /FD /GZ /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0xc09 /d "_DEBUG"\r
 # ADD RSC /l 0xc09 /d "_DEBUG"\r
@@ -76,7 +75,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib gdi32.lib shell32.lib glut32.lib wsock32.lib simgear.lib fnt.lib pui.lib sg.lib sl.lib ssg.lib ul.lib mk4vc60_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"\usr\lib" /libpath:"\usr\lib\simgear" /libpath:"\usr\lib\plib"\r
+# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib gdi32.lib shell32.lib glut32.lib wsock32.lib simgear.lib fnt.lib pui.lib sg.lib sl.lib ssg.lib mk4vc60_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"\lib" /libpath:"\lib\simgear" /libpath:"\lib\plib"\r
 \r
 !ENDIF \r
 \r

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 6d157635edb989dac4c96066b9f60893aca94ecf..1d09ee014550434bde4e1359aca6d78a726a3eca 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -41,9 +41,9 @@
  *       supports calling a function template by providing its template
  *       arguments explicitly.
  *
- *  (7)  Defines FG_NEED_AUTO_PTR if STL doesn't provide auto_ptr<>.
+ *  (7)  Defines SG_NEED_AUTO_PTR if STL doesn't provide auto_ptr<>.
  *
- *  (8)  Defines FG_NO_ARROW_OPERATOR if the compiler is unable
+ *  (8)  Defines SG_NO_ARROW_OPERATOR if the compiler is unable
  *       to support operator->() for iterators.
  *
  *  (9)  Defines FG_USE_EXCEPTIONS if the compiler supports exceptions.
@@ -83,16 +83,16 @@
 #      define STL_STRING     <string>
 #      define STL_STRSTREAM  <strstream.h>
 
-#      define FG_NEED_AUTO_PTR
+#      define SG_NEED_AUTO_PTR
 #      define FG_NO_DEFAULT_TEMPLATE_ARGS
 #      define FG_INCOMPLETE_FUNCTIONAL
-#      define FG_NO_ARROW_OPERATOR
+#      define SG_NO_ARROW_OPERATOR
 
 #    elif __GNUC_MINOR__ >= 8
 
        // g++-2.8.x and egcs-1.x
 #      define SG_EXPLICIT_FUNCTION_TMPL_ARGS
-#      define FG_NEED_AUTO_PTR
+#      define SG_NEED_AUTO_PTR
 #      define FG_MEMBER_TEMPLATES
 #      define FG_NAMESPACES
 #      define FG_HAVE_STD
@@ -253,7 +253,7 @@
 #  define FG_HAVE_NATIVE_SGI_COMPILERS
 
 #  define SG_EXPLICIT_FUNCTION_TMPL_ARGS
-#  define FG_NEED_AUTO_PTR
+#  define SG_NEED_AUTO_PTR
 #  define FG_MEMBER_TEMPLATES
 #  define FG_NAMESPACES
 #  define FG_HAVE_STD