solenv/gbuild/gbuild.mk | 2 ++ svl/source/numbers/zforlist.cxx | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit b8184381bfa5fce44560d01ee8f3ed321cef4bb5 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Apr 24 14:07:16 2012 +0200 Revert "Avoid bogus warnings (GCC 4.4.6)" This reverts commit cf9c715aee2f97a1a6f611fe46a47e238cb03658. 3c82780cbc7cf17cf348e7f49b99663cfdc42ed7 "Set gb_DEBUGLEVEL=1 for --enable-dbgutil after all" fixes the underlying problem, making this awkward workaround no longer necessary. diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 93007ab..83a1232 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -1303,7 +1303,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType ) if ( nDefaultFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) { // look for a defined standard sal_uInt32 nStopKey = CLOffset + SV_COUNTRY_LANGUAGE_OFFSET; - sal_uInt32 nKey = 0; // avoid bogus warning (GCC 4.4.6) + sal_uInt32 nKey; SvNumberFormatTable::iterator it2 = aFTable.find( CLOffset ); while ( it2 != aFTable.end() && (nKey = it2->first ) >= CLOffset && nKey < nStopKey ) { @@ -3326,7 +3326,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultCurrencyFormat() { // look for a defined standard sal_uInt32 nStopKey = CLOffset + SV_COUNTRY_LANGUAGE_OFFSET; - sal_uInt32 nKey = 0; // avoid bogus warning (GCC 4.4.6) + sal_uInt32 nKey; SvNumberFormatTable::iterator it2 = aFTable.lower_bound( CLOffset ); while ( it2 != aFTable.end() && (nKey = it2->first) >= CLOffset && nKey < nStopKey ) { commit fc7a55fd3f2df0ffc9ea64751ebdc187a58b778c Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Apr 24 14:00:57 2012 +0200 Set gb_DEBUGLEVEL=1 for --enable-dbgutil after all This is a partial revert of db8df57acd601ed084bd0122683e1bd066a4f143 "fixes for debug flags handling." Removing this caused various nastinesses, at least: * Some tinderbox started to emit bogus compiler warnings at -O2 vs. -O0, see cf9c715aee2f97a1a6f611fe46a47e238cb03658 "Avoid bogus warnings (GCC 4.4.6)" * General DBG_UTIL vs. OSL_DEBUG_LEVEL confusion in the code, see 729165ebacc6ff8bd1e5c936252cdace1782824b "OSL_DEBUG_LEVEL > 0 -> defined DBG_UTIL" and a7c7942fd1946da978673d2c350630f83603d18d "DBG_UTIL vs OSL_DEBUG_LEVEL confusion" * --enable-dbgutil would no longer prevent -DNDEBUG (i.e., assert became ineffective in such builds) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 578393e..7d1d66e 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -99,6 +99,8 @@ endif gb_DEBUGLEVEL := 0 ifneq ($(strip $(DEBUG)$(debug)),) gb_DEBUGLEVEL := 1 +else ifeq ($(gb_PRODUCT),$(false)) +gb_DEBUGLEVEL := 1 endif ifneq ($(strip $(DBGLEVEL)$(dbglevel)),) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits