OOO330
[LibreOffice.git] / stlport / STLport-4.0-sunstudio12u1.patch
blob49d76abbd83606ca70dae8896c9952dc7e6fd4c0
1 --- misc/STLport-4.0/stlport/config/stl_sunpro.h Mon Jul 6 13:43:35 2009
2 +++ misc/build/STLport-4.0/stlport/config/stl_sunpro.h Mon Jul 6 13:56:56 2009
3 @@ -31,7 +31,8 @@
4 # endif
5 # endif
7 -# if (__SUNPRO_CC < 0x600)
8 +// support SunStudio compiler 12u1 version 5.10 (which results in 0x5100)
9 +# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000))
10 // those are tested and proved not to work...
11 # define __STL_STATIC_ARRAY_BUG 1
12 # define __STL_STATIC_CONST_INIT_BUG 1
13 @@ -57,7 +58,7 @@
14 # define __STL_NO_FRIEND_TEMPLATES 1
15 #endif
17 -# if (__SUNPRO_CC < 0x600)
18 +# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000))
19 # define __STL_HAS_NO_NEW_C_HEADERS 1
20 # define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS
21 # define __STL_NON_TYPE_TMPL_PARAM_BUG 1