CWS-TOOLING: integrate CWS cmcfixes62

2009-09-22 21:19:24 +0200 cmc  r276365 : #i100000# that's the most plausible explanation, -D$(CVER) is needed by scp2 under windows
2009-09-19 16:10:36 +0200 cmc  r276303 : #i100000# revert this for no partically good reason
2009-09-18 14:16:47 +0200 cmc  r276279 : remove extra build depend
2009-09-18 08:56:15 +0200 cmc  r276265 : #i100000# rerun autoconf
2009-09-17 14:59:38 +0200 cmc  r276245 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@276192 (milestone: DEV300:m59)
2009-09-10 16:40:49 +0200 pl  r276041 : fix warning
2009-09-10 11:34:55 +0200 pl  r276026 : disable warning from system header
2009-09-09 19:30:45 +0200 pl  r276013 : use osl_getAsciiFunctionSymbol instead of strange cast
2009-09-09 19:25:32 +0200 pl  r276012 : add some casting hacks to make compile on solaris cc
2009-09-09 19:10:48 +0200 pl  r276009 : add missing Configure option for solaris sparce 32bit
2009-09-09 18:37:05 +0200 pl  r276008 : merge fix for #i104525# into moved code
2009-09-07 13:28:08 +0200 cmc  r275894 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275801 (milestone: DEV300:m57)
2009-08-28 12:36:27 +0200 cmc  r275523 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275331 (milestone: DEV300:m56)
2009-08-26 12:56:18 +0200 cmc  r275413 : #i104088# use the right headers in the right place
2009-08-25 17:07:50 +0200 cmc  r275372 : #i104500# make openssl build on linux that isn't x86 or x86_64
2009-08-25 13:08:48 +0200 cmc  r275347 : #i89237# pretty picswitch up
2009-08-25 10:58:09 +0200 cmc  r275342 : #i104489# remove last unused code in starmath
2009-08-25 10:23:33 +0200 cmc  r275338 : #i104088# clean up the define post-move
2009-08-24 13:46:57 +0200 cmc  r275310 : #i104088# 64bit odbc api changes
2009-08-24 13:42:52 +0200 cmc  r275309 : #i89237# unify linux platform mks under a generic parent
2009-08-24 13:19:52 +0200 cmc  r275307 : #i104455# remove unused code
2009-08-24 13:10:56 +0200 cmc  r275306 : #i104088# 64bit odbc api changes
2009-08-24 10:07:50 +0200 cmc  r275293 : #i104306# move recent-used to vcl
2009-08-24 09:32:08 +0200 cmc  r275291 : #i104306# move recent-used to vcl
2009-08-23 22:01:07 +0200 cmc  r275286 : #i104306# move recently-used to vcl
2009-08-22 15:25:25 +0200 cmc  r275285 : #i104088# 64bit odbc api changes
2009-08-21 17:52:40 +0200 cmc  r275268 : #i104306# move recently-used to vcl
2009-08-21 14:38:26 +0200 cmc  r275257 : #i104408 make these headers ready for c++0x
2009-08-21 14:20:19 +0200 cmc  r275251 : #i104406# avoid overlapping strcpy to avoid bustage on recent toolchains
2009-08-21 14:14:25 +0200 cmc  r275250 : #i104385# silence 64bit warnings

6 files changed, 47 insertions, 28 deletions

diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional
index 6fb7e66330f6..232cddbef5ad 100644
--- a/stlport/systemstl/functional
+++ b/stlport/systemstl/functional
@@ -32,30 +32,33 @@
 #define SYSTEM_STL_FUNCTIONAL
 
 #ifdef GCC
-#ifdef __MINGW32__
+# ifdef __MINGW32__
 #  define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
 #  include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,functional)
-#else
+# else
 #  include <ext/../functional>
-#endif
-#include <ext/functional>
+# endif
+#  include <ext/functional>
 
 namespace std
 {
-	using __gnu_cxx::select1st;
-	using __gnu_cxx::select2nd;
 	using __gnu_cxx::project1st;
 	using __gnu_cxx::project2nd;
-	using __gnu_cxx::unary_compose;
-	using __gnu_cxx::binary_compose;
+	using __gnu_cxx::select1st;
+	using __gnu_cxx::select2nd;
 	using __gnu_cxx::compose1;
 	using __gnu_cxx::compose2;
+	using __gnu_cxx::unary_compose;
+	using __gnu_cxx::binary_compose;
+# ifndef __GXX_EXPERIMENTAL_CXX0X__
 	using __gnu_cxx::identity;
 	using __gnu_cxx::mem_fun1;
 	using __gnu_cxx::mem_fun1_ref;
+# endif
 }
+
 #else
-#error UNSUPPORTED COMPILER
+# error UNSUPPORTED COMPILER
 #endif
 
 #endif
diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
index e855427f2c67..b969b11b211b 100644
--- a/stlport/systemstl/hash_map
+++ b/stlport/systemstl/hash_map
@@ -31,11 +31,14 @@
 #ifndef SYSTEM_STL_HASHMAP
 #define SYSTEM_STL_HASHMAP
 
-#define _BACKWARD_BACKWARD_WARNING_H 1
-#include <ext/hash_map>
-#undef _BACKWARD_BACKWARD_WARNING_H
-
 #ifdef GCC
+
+# include <functional>
+
+# define _BACKWARD_BACKWARD_WARNING_H 1
+# include <ext/hash_map>
+# undef _BACKWARD_BACKWARD_WARNING_H
+
 namespace __gnu_cxx
 {
     template<> struct hash < std::string >
@@ -62,14 +65,18 @@ namespace __gnu_cxx
         } 
     };
 }
+
 namespace std
 {
+# ifndef __GXX_EXPERIMENTAL_CXX0X__
 	using __gnu_cxx::hash;
+# endif
 	using __gnu_cxx::hash_map;
 	using __gnu_cxx::hash_multimap;
 }
+
 #else
-#error UNSUPPORTED COMPILER
+# error UNSUPPORTED COMPILER
 #endif
 
 
diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set
index 35ceccad40d1..89c4b51853dd 100644
--- a/stlport/systemstl/hash_set
+++ b/stlport/systemstl/hash_set
@@ -31,21 +31,25 @@
 #ifndef SYSTEM_STL_HASHSET
 #define SYSTEM_STL_HASHSET
 
-#define _BACKWARD_BACKWARD_WARNING_H 1
-#include <ext/hash_set>
-#undef _BACKWARD_BACKWARD_WARNING_H 
-
 #ifdef GCC
+
+# include <functional>
+
+# define _BACKWARD_BACKWARD_WARNING_H 1
+# include <ext/hash_set>
+# undef _BACKWARD_BACKWARD_WARNING_H 
+
 namespace std
 {
+# ifndef __GXX_EXPERIMENTAL_CXX0X__
 	using __gnu_cxx::hash;
+# endif
 	using __gnu_cxx::hash_set;
 	using __gnu_cxx::hash_multiset;
 }
 #else
-#error UNSUPPORTED COMPILER
+# error UNSUPPORTED COMPILER
 #endif
 
-
 #endif
 /* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric
index d18328bc5363..5ea17ad0758a 100644
--- a/stlport/systemstl/numeric
+++ b/stlport/systemstl/numeric
@@ -32,22 +32,24 @@
 #define SYSTEM_STL_NUMERIC
 
 #ifdef GCC
-#include <functional>
-#ifdef __MINGW32__
+# include <functional>
+# ifdef __MINGW32__
 #  define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
 #  include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,numeric)
-#else
+# else
 #  include <ext/../numeric>
-#endif
-#include <ext/numeric>
+# endif
+# include <ext/numeric>
 
+# ifndef __GXX_EXPERIMENTAL_CXX0X__
 namespace std
 {
 	using __gnu_cxx::iota;
 }
+# endif
 
 #else
-#error UNSUPPORTED COMPILER
+# error UNSUPPORTED COMPILER
 #endif
 
 #endif
diff --git a/stlport/systemstl/rope b/stlport/systemstl/rope
index 6441d9549988..c6349947ca7b 100644
--- a/stlport/systemstl/rope
+++ b/stlport/systemstl/rope
@@ -33,9 +33,11 @@
 
 #include <functional>
 #include <numeric>
-#include <ext/rope>
 
 #ifdef GCC
+
+#include <ext/rope>
+
 namespace std
 {
 	using __gnu_cxx::rope;
diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist
index 27a46f9b23c1..48a37c2fd512 100644
--- a/stlport/systemstl/slist
+++ b/stlport/systemstl/slist
@@ -31,9 +31,10 @@
 #ifndef SYSTEM_STL_SLIST
 #define SYSTEM_STL_SLIST
 
+#ifdef GCC
+
 #include <ext/slist>
 
-#ifdef GCC
 namespace std
 {
 	using __gnu_cxx::slist;