[Libreoffice-commits] core.git: comphelper/source

[Stephan Bergmann]

 comphelper/source/property/propertystatecontainer.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b35e797ca0e2c7e7ad6dbccea6b92208b209677c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 2 23:13:49 2015 +0100

    Assume this shall be conditional on DBG_UTIL
    
    ...and not that MSVC-special _DEBUG
    
    Change-Id: I927f1d49dcbb24fd8fb91032ded6215390c97d79

diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index 3b5e7ed..01cfe36 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -89,7 +89,7 @@ namespace comphelper
         if ( !nProperties )
             return aStates;
 
-#ifdef _DEBUG
+#ifdef DBG_UTIL
         // precondition: property sequence is sorted (the algorithm below relies on this)
         {
             const OUString* pNames = _rPropertyNames.getConstArray();
@@ -114,7 +114,7 @@ namespace comphelper
         osl::MutexGuard aGuard( rBHelper.rMutex );
         for ( ; ( pAllProperties != pAllPropertiesEnd ) && ( pLookup != pLookupEnd ); ++pAllProperties )
         {
-#ifdef _DEBUG
+#ifdef DBG_UTIL
             if ( pAllProperties < pAllPropertiesEnd - 1 )
                 OSL_ENSURE( pAllProperties->Name.compareTo( (pAllProperties + 1)->Name ) < 0,
                     "OPropertyStateContainer::getPropertyStates: all-properties not sorted!" );