summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-08-21 14:17:45 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-08-21 14:30:37 +0300
commit9097947b9bed8e3005af4a73df93b9c54c938cd1 (patch)
tree666d985a545ee3b03b6abc0db0c9110ee26e1d76
parent5f4f2b8208f97b4fdf36dc8c1df01aa4056ad87c (diff)
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.
-rw-r--r--cppu/source/typelib/typelib.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 9403de920944..6740dd55fee1 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" );