diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:08:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:08:44 +0000 |
| commit | 5727f7af5e1b7168ed1450de14cea431789a07b7 (patch) | |
| tree | dbf6bf70227e983ecfc57b6af67690f62c313ffd /stlport | |
| parent | 34b349a489075d4c8e2663d797694149629954c7 (diff) | |
INTEGRATION: CWS warnings01 (1.31.8); FILE MERGED
2006/01/25 21:59:33 sb 1.31.8.4: RESYNC: (1.32-1.33); FILE MERGED
2005/09/23 00:21:14 sb 1.31.8.3: RESYNC: (1.31-1.32); FILE MERGED
2005/08/31 13:04:28 sb 1.31.8.2: #i53898# Made code warning-free.
2005/08/29 13:00:23 sb 1.31.8.1: #i53898# Disable warnings from within STLport headers on unxsoli4 and unxsols4.
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/makefile.mk | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index cdb5cf577474..0e1385ac0777 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.33 $ +# $Revision: 1.34 $ # -# last change: $Author: obo $ $Date: 2005-12-21 16:51:24 $ +# last change: $Author: hr $ $Date: 2006-06-20 04:08:44 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -71,6 +71,28 @@ $(INCCOM)$/stlport$/hash_map : systemstl/hash_map PATCH_FILE_NAME=STLport-4.0.macosx.patch .ELSE TARFILE_NAME=STLport-4.0 + # To disable warnings from within STLport headers on unxsoli4 and + # unxsols4, STLport-4.0.patch had to be extended mechanically by + # + # cd unxsol.../misc/build/STLport-4.0/stlport && \ + # find . -type f -exec sed -i \ + # -e 's/^\([ \t]*__STL_BEGIN_NAMESPACE[ \t]*\)$/#if defined \ + # __SUNPRO_CC\n#pragma disable_warn\n#endif\n&/' \ + # -e 's/^\([ \t]*__STL_END_NAMESPACE[ \t]*\)$/&\n#if defined \ + # __SUNPRO_CC\n#pragma enable_warn\n#endif/' {} \; + # + # (causing lots of files to become modified) and by additionally + # changing unxsol.../misc/build/STLport-4.0/stlport/math.h, + # unxsol.../misc/build/STLport-4.0/stlport/stl/_config.h, + # unxsol.../misc/build/STLport-4.0/stlport/stl/_list.h, and + # unxsol.../misc/build/STLport-4.0/stlport/stl/type_traits.h manually. + # (Obviously due to the way the C++ compiler generates code for + # instantiations of inline function templates from STLport headers, it + # does not work to simply add "#pragma disable_warn" to stl/_prolog.h + # and "#pragma enable_warn" to stl/_epilog.h, as seemingly some internal + # STLport headers are read in by the compiler only at the end of a + # compilation unit, outside the scope of stl/_prolog.h and + # stl/_epilog.h.) PATCH_FILE_NAME=STLport-4.0.patch .ENDIF # "$(OS)"=="MACOSX" .ENDIF # "$(COMID)"=="gcc3" |