tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I disentangled my previous patch and converted fprintf statements to SAL_INFOs Change-Id: I4b993e00f82bdf904586ab5e7c954c4ee3ff1bac Reviewed-on: https://gerrit.libreoffice.org/22925 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
This commit is contained in:
committed by
Björn Michaelsen
parent
f0de4374ff
commit
c829898453
@@ -429,6 +429,7 @@ certain functionality.
|
|||||||
@li @c vcl.kde - KDE
|
@li @c vcl.kde - KDE
|
||||||
@li @c vcl.kde4 - KDE4
|
@li @c vcl.kde4 - KDE4
|
||||||
@li @c vcl.layout - Widget layout
|
@li @c vcl.layout - Widget layout
|
||||||
|
@li @c vcl.lazydelete
|
||||||
@li @c vcl.pdfwriter
|
@li @c vcl.pdfwriter
|
||||||
@li @c vcl.plugadapt - the Unix/X11 backend plugin mechanism
|
@li @c vcl.plugadapt - the Unix/X11 backend plugin mechanism
|
||||||
@li @c vcl.opengl
|
@li @c vcl.opengl
|
||||||
|
@@ -28,10 +28,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#if OSL_DEBUG_LEVEL > 2
|
|
||||||
#include <typeinfo>
|
#include <typeinfo>
|
||||||
#include <stdio.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <com/sun/star/lang/XComponent.hpp>
|
#include <com/sun/star/lang/XComponent.hpp>
|
||||||
|
|
||||||
@@ -128,10 +125,7 @@ namespace vcl
|
|||||||
LazyDeletor() { LazyDelete::addDeletor( this ); }
|
LazyDeletor() { LazyDelete::addDeletor( this ); }
|
||||||
virtual ~LazyDeletor()
|
virtual ~LazyDeletor()
|
||||||
{
|
{
|
||||||
#if OSL_DEBUG_LEVEL > 2
|
SAL_INFO("vcl.lazydelete", typeid(*this).name() << std::hex << this << " deleted");
|
||||||
fprintf( stderr, "%s %p deleted\n",
|
|
||||||
typeid(*this).name(), this );
|
|
||||||
#endif
|
|
||||||
if( s_pOneInstance == this ) // sanity check
|
if( s_pOneInstance == this ) // sanity check
|
||||||
s_pOneInstance = nullptr;
|
s_pOneInstance = nullptr;
|
||||||
|
|
||||||
@@ -151,12 +145,8 @@ namespace vcl
|
|||||||
nCount = aRealDelete.size();
|
nCount = aRealDelete.size();
|
||||||
for( unsigned int n = 0; n < nCount; n++ )
|
for( unsigned int n = 0; n < nCount; n++ )
|
||||||
{
|
{
|
||||||
#if OSL_DEBUG_LEVEL > 2
|
SAL_INFO("vcl.lazydelete", typeid(*this).name() << " deletes object " << aRealDelete[n] << " of type "
|
||||||
fprintf( stderr, "%s deletes object %p of type %s\n",
|
<< typeid(*aRealDelete[n]).name());
|
||||||
typeid(*this).name(),
|
|
||||||
aRealDelete[n],
|
|
||||||
typeid(*aRealDelete[n]).name() );
|
|
||||||
#endif
|
|
||||||
// check if the object to be deleted is not already destroyed
|
// check if the object to be deleted is not already destroyed
|
||||||
// as a side effect of a previous lazily destroyed object
|
// as a side effect of a previous lazily destroyed object
|
||||||
if( ! m_aObjects[ m_aPtrToIndex[ reinterpret_cast<sal_IntPtr>(aRealDelete[n].get()) ] ].m_bDeleted )
|
if( ! m_aObjects[ m_aPtrToIndex[ reinterpret_cast<sal_IntPtr>(aRealDelete[n].get()) ] ].m_bDeleted )
|
||||||
@@ -296,5 +286,4 @@ namespace vcl
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
|
Reference in New Issue
Block a user