From e918ee689c76a19a7312d0450f1a91b77603d8f2 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 1 Jul 2008 14:59:32 +0000 Subject: [PATCH] INTEGRATION: CWS odfmetadata (1.44.4); FILE MERGED 2008/06/25 09:59:04 mst 1.44.4.3: RESYNC: (1.44-1.46); FILE MERGED 2008/06/17 14:59:08 mst 1.44.4.2: - solenv/inc/unxsol{i,s}4.mk: + sort warnings alphabetically 2008/06/17 08:46:44 mst 1.44.4.1: - solenv/inc/unxsol{i,s}4.mk: + disable warning: identexpected: Identifier expected instead of "}" --- solenv/inc/unxsoli4.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index fa0c2a996f1d..69197d39b136 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -8,7 +8,7 @@ # # $RCSfile: unxsoli4.mk,v $ # -# $Revision: 1.46 $ +# $Revision: 1.47 $ # # This file is part of OpenOffice.org. # @@ -79,6 +79,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 @@ -93,7 +96,7 @@ CFLAGSOUTOBJ=-o # sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be # disabled globally CFLAGSWARNCC= -CFLAGSWARNCXX=+w2 -erroff=doubunder,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn +CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn CFLAGSWALLCC=$(CFLAGSWARNCC) CFLAGSWALLCXX=$(CFLAGSWARNCXX) CFLAGSWERRCC=-errwarn=%all