summaryrefslogtreecommitdiff
path: root/bridges/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-04-15 15:28:57 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-04-15 15:28:57 +0000
commit03333e6de9617ac34d9372def6743409fceffbd9 (patch)
treedede38e9f9fa8c8610483e9de223accd9b9ee6ae /bridges/source
parent4ab9e8a2425c73de1e0acd42e4fc5438d2cec0d1 (diff)
INTEGRATION: CWS dbgmacros1 (1.14.60); FILE MERGED
2003/04/09 10:15:46 kso 1.14.60.1: #108413# - debug macro unification.
Diffstat (limited to 'bridges/source')
-rw-r--r--bridges/source/remote/urp/urp_environment.cxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/bridges/source/remote/urp/urp_environment.cxx b/bridges/source/remote/urp/urp_environment.cxx
index a7c55eddfe6b..a00bec3c3d83 100644
--- a/bridges/source/remote/urp/urp_environment.cxx
+++ b/bridges/source/remote/urp/urp_environment.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: urp_environment.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: jbu $ $Date: 2001-07-04 14:29:29 $
+ * last change: $Author: vg $ $Date: 2003-04-15 16:28:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,7 +59,6 @@
*
************************************************************************/
-#include <assert.h>
#include <stdio.h>
#include <osl/interlck.h>
@@ -212,7 +211,7 @@ struct StaticSingleton
};
StaticSingleton singleton;
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
static MyCounter thisCounter( "Remote Environment" );
#endif
@@ -358,7 +357,7 @@ void RemoteEnvironment::thisDispose( uno_Environment *pEnvRemote )
pImpl->m_pLogFile = 0;
}
#endif
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
pImpl->dumpErrors( stderr );
#endif
@@ -401,7 +400,7 @@ void RemoteEnvironment::thisDisposing( uno_Environment *pEnvRemote )
delete pImpl;
pContext->aBase.release( (uno_Context * ) pContext );
g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
thisCounter.release();
#endif
}
@@ -530,7 +529,7 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment(
new PropertySetterThread( pEnvRemote, pImpl , sProtocolProperties );
pPropsSetterThread->create();
}
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
thisCounter.acquire();
#endif
}