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 "}"
This commit is contained in:
parent
19b24abf68
commit
e918ee689c
1 changed files with 5 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue