[Libreoffice-commits] .: 2 commits - cppu/source solenv/gbuild

[Tor Lillqvist]

 cppu/source/typelib/typelib.cxx   |    2 +-
 solenv/gbuild/platform/windows.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9097947b9bed8e3005af4a73df93b9c54c938cd1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Aug 21 14:17:45 2011 +0300

    Revert "I am tired of thesee assertions, put them behind dbglevel>2"
    
    Nah, having them behind dbglevel>1 is fine (which already means these
    assertions won't normally be compiled even with --enable-debug).
    
    I got mislead as I was building with dbglevel=2 everywhere. But
    pondering the point of dbglevel a.k.a. OSL_DEBUG_LEVEL, I think the
    right way to see it is: You are not supposed to build all (or large
    parts) of LibreOffice with dbglevel=2. If we used OSL_TRACE all over
    the place as thoroughly as in some files in sal/rtl, that would lead
    to astronomical amounts of tracing output. (We don't use OSL_TRACE
    like that, but that is another thing...)
    
    I think the intended use of dbglevel is that you should build with
    dbglevel=2 only the small part of code you are currently actively
    working on, when you want to see trace output.
    
    Of course, another problem then is that in some modules and/or
    libraries it might not be possible to compile just a part of the
    sources with dbglevel=2. That should be fixed.
    
    This reverts commit a3bad2855032fb2742feea1e0e350297d41f69fe.

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 9403de9..6740dd5 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -338,7 +338,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
         delete pWeakMap;
         pWeakMap = 0;
     }
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 1
     OSL_ENSURE( !nTypeDescriptionCount, "### nTypeDescriptionCount is not zero" );
     OSL_ENSURE( !nCompoundTypeDescriptionCount, "### nCompoundTypeDescriptionCount is not zero" );
     OSL_ENSURE( !nUnionTypeDescriptionCount, "### nUnionTypeDescriptionCount is not zero" );
commit 5f4f2b8208f97b4fdf36dc8c1df01aa4056ad87c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Aug 21 08:32:52 2011 +0300

    Also oldnames.lib

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index e69643f..70da92d 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -399,7 +399,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
 		$(LIBS) \
-		$(if $(gb_PRODUCT),,msvcrtd.lib msvcprtd.lib kernel32.lib user32.lib) \
+		$(if $(gb_PRODUCT),,oldnames.lib msvcrtd.lib msvcprtd.lib kernel32.lib user32.lib) \
 		$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
 	$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
 endef