Added support for #include STL_ITERATOR

diff --git a/SimGear.dsp b/SimGear.dsp
index a8fc058ec4dd377fa152fea7e3340c32b8995a16..3ca659107d7dabe1ead0b7be6744a92efd9c8117 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -710,6 +710,21 @@ SOURCE=.\simgear\metar\Stspack3.cpp
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\misc\commands.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgmisc"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgmisc"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\misc\props.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1433,6 +1448,21 @@ SOURCE=.\simgear\zlib\zutil.c
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\zlib\zutil.h\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_z"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_z"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 3195702cc3d7b27f123eec36dff5dcce89012c95..1cd14c368b36121c2cf6f86e3a1615ad93f27a75 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -80,6 +80,7 @@
 #      define STL_FUNCTIONAL <functional>
 #      define STL_IOMANIP    <iomanip.h>
 #      define STL_IOSTREAM   <iostream.h>
+#      define STL_ITERATOR   <iterator.h>
 #      define STL_FSTREAM    <fstream.h>
 #      define STL_STDEXCEPT  <stdexcept>
 #      define STL_STRING     <string>
@@ -105,6 +106,7 @@
 #      define STL_FUNCTIONAL <functional>
 #      define STL_IOMANIP    <iomanip>
 #      define STL_IOSTREAM   <iostream>
+#      define STL_ITERATOR   <iterator>
 #      define STL_FSTREAM    <fstream>
 #      define STL_STDEXCEPT  <stdexcept>
 #      define STL_STRING     <string>
@@ -126,6 +128,7 @@
 #      define STL_FUNCTIONAL <functional>
 #      define STL_IOMANIP    <iomanip>
 #      define STL_IOSTREAM   <iostream>
+#      define STL_ITERATOR   <iterator>
 #      define STL_FSTREAM    <fstream>
 #      define STL_STDEXCEPT  <stdexcept>
 #      define STL_STRING     <string>
@@ -149,6 +152,7 @@
 #  define STL_FUNCTIONAL <functional>
 #  define STL_IOMANIP    <iomanip>
 #  define STL_IOSTREAM   <iostream>
+#  define STL_ITERATOR   <iterator>
 #  define STL_FSTREAM    <fstream>
 #  define STL_STDEXCEPT  <stdexcept>
 #  define STL_STRING     <string>
@@ -171,6 +175,7 @@
 #  define STL_FUNCTIONAL <functional>
 #  define STL_IOMANIP    <iomanip>
 #  define STL_IOSTREAM   <iostream>
+#  define STL_ITERATOR   <iterator>
 #  define STL_FSTREAM    <fstream>
 #  define STL_STDEXCEPT  <stdexcept>
 #  define STL_STRING     <string>
@@ -202,6 +207,7 @@
 #    define STL_FUNCTIONAL <functional>
 #    define STL_IOMANIP    <iomanip>
 #    define STL_IOSTREAM   <iostream>
+#    define STL_ITERATOR   <iterator>
 #    define STL_FSTREAM    <fstream>
 #    define STL_STDEXCEPT  <stdexcept>
 #    define STL_STRING     <string>
@@ -238,6 +244,7 @@
 # endif // HAVE_SGI_STL_PORT
 
 #  define STL_IOSTREAM   <iostream>
+#  define STL_ITERATOR   <iterator>
 #  define STL_FSTREAM    <fstream>
 #  define STL_STRING     <string>
 #  define SG_NO_DEFAULT_TEMPLATE_ARGS
@@ -265,6 +272,7 @@
 #  define STL_FUNCTIONAL <functional>
 #  define STL_IOMANIP    <iomanip.h>
 #  define STL_IOSTREAM   <iostream.h>
+#  define STL_ITERATOR   <iterator.h>
 #  define STL_FSTREAM    <fstream.h>
 #  define STL_STDEXCEPT  <stdexcept>
 #  define STL_STRING     <string>