From 42ebbef273b8d84a3ddd259c1350e628543a70db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Wed, 27 Aug 2008 12:38:26 +0000 Subject: [PATCH] INTEGRATION: CWS sb91 (1.2.26); FILE MERGED 2008/07/11 10:04:34 sb 1.2.26.1: #i91567# consistently use -erroff=identexpected on all unxsol... platforms --- solenv/inc/unxsolu4.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk index f60d237f73b5..8ff063f46a97 100644 --- a/solenv/inc/unxsolu4.mk +++ b/solenv/inc/unxsolu4.mk @@ -8,7 +8,7 @@ # # $RCSfile: unxsolu4.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # # This file is part of OpenOffice.org. # @@ -83,6 +83,9 @@ CFLAGSOUTOBJ=-o # Warnings switched off for CXX: # - doubunder: we have many identifiers containing double underscores, some of # them in the stable UDK API we cannot change +# - identexpected: Identifier expected instead of "}" +# if an enum ends with a comma before the '}' +# this warning does not seem to heed #pragma disable_warn, and is not helpful # - inllargeuse: "function is too large and will not be expanded inline" is # merely a hint # - inllargeint: "function is too large to generate inline, consider writing @@ -103,7 +106,7 @@ CFLAGSOUTOBJ=-o # - hidef: "d::foo() hides the function b::foo()." We got still some cases of mixed # sal_uInt32 and ULONG usages which needs to be fixed. We can then remove this one CFLAGSWARNCC= -CFLAGSWARNCXX=+w2 -erroff=doubunder,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,hidef,anonnotype,unassigned,badargtype2w +CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,hidef,anonnotype,unassigned,badargtype2w CFLAGSWALLCC=$(CFLAGSWARNCC) CFLAGSWALLCXX=$(CFLAGSWARNCXX) CFLAGSWERRCC=-errwarn=%all