Kaydet (Commit) b430ec96 authored tarafından Rohan Kumar's avatar Rohan Kumar Kaydeden (comit) Björn Michaelsen

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

I removed OSL_DEBUG_LEVEL > 1 conditionals and in some
places i replaced OSL_ENSURE(..) with assert()

Change-Id: Ide7e4b633e85a699f680f47caac5bff36bf180a2
Reviewed-on: https://gerrit.libreoffice.org/23076Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
üst 8dd5dbbb
...@@ -73,7 +73,7 @@ using namespace com::sun::star::xml::dom; ...@@ -73,7 +73,7 @@ using namespace com::sun::star::xml::dom;
using namespace xforms; using namespace xforms;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 0
#define DBG_INVARIANT_TYPE(TYPE) class DBG_##TYPE { const TYPE* mpT; void check() { mpT->dbg_assertInvariant(); } public: DBG_##TYPE(const TYPE* pT) : mpT(pT) { check(); } ~DBG_##TYPE() { check(); } } _DBG_##TYPE(this); #define DBG_INVARIANT_TYPE(TYPE) class DBG_##TYPE { const TYPE* mpT; void check() { mpT->dbg_assertInvariant(); } public: DBG_##TYPE(const TYPE* pT) : mpT(pT) { check(); } ~DBG_##TYPE() { check(); } } _DBG_##TYPE(this);
#define DBG_INVARIANT() DBG_INVARIANT_TYPE(Model) #define DBG_INVARIANT() DBG_INVARIANT_TYPE(Model)
...@@ -197,17 +197,17 @@ void Model::setExternalData( bool _bData ) ...@@ -197,17 +197,17 @@ void Model::setExternalData( bool _bData )
mbExternalData = _bData; mbExternalData = _bData;
} }
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 0
void Model::dbg_assertInvariant() const void Model::dbg_assertInvariant() const
{ {
OSL_ENSURE( mpInstances != NULL, "no instances found" ); assert(mpInstances && "no instances found");
OSL_ENSURE( mxInstances.is(), "No instance container!" ); assert(mxInstances.is() && "No instance container!");
OSL_ENSURE( mpBindings != NULL, "no bindings element" ); assert(mpBindings && "no bindings element");
OSL_ENSURE( mxBindings.is(), "No Bindings container" ); assert(mxBindings.is() && "No Bindings container");
OSL_ENSURE( mpSubmissions != NULL, "no submissions element" ); assert(mpSubmissions && "no submissions element");
OSL_ENSURE( mxSubmissions.is(), "No Submission container" ); assert(mxSubmissions.is() && "No Submission container");
} }
#endif #endif
......
...@@ -145,7 +145,7 @@ public: ...@@ -145,7 +145,7 @@ public:
void setExternalData( bool _bData ); void setExternalData( bool _bData );
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 0
void dbg_assertInvariant() const; void dbg_assertInvariant() const;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment