[Libreoffice-commits] core.git: include/osl registry/test

Michaël Lefèvre lefevre00 at yahoo.fr
Fri Apr 25 02:57:45 PDT 2014


 include/osl/diagnose.h      |    2 --
 registry/test/regdiagnose.h |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit fe075edc27a1fc301c31cfdff5ddbc83e52d929f
Author: Michaël Lefèvre <lefevre00 at yahoo.fr>
Date:   Mon Apr 7 15:33:26 2014 +0200

    fdo#43157 : [API CHANGE] Remove OSL_THIS_FILE
    
    Change-Id: Ifa6bdb2f2bdf96826f09c42a1e36d97ed6e034cd
    Reviewed-on: https://gerrit.libreoffice.org/8886
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h
index e64160c..fdae8cc 100644
--- a/include/osl/diagnose.h
+++ b/include/osl/diagnose.h
@@ -87,8 +87,6 @@
 #define OSL_DEBUG_LEVEL 0
 #endif
 
-#define OSL_THIS_FILE       __FILE__
-
 /* the macro OSL_LOG_PREFIX is intended to be an office internal macro for now
 
    it is deprecated and superseded by (C++ only) SAL_WHERE
diff --git a/registry/test/regdiagnose.h b/registry/test/regdiagnose.h
index 1ac6e92..69aa1b1 100644
--- a/registry/test/regdiagnose.h
+++ b/registry/test/regdiagnose.h
@@ -23,7 +23,7 @@
 
 #include <osl/diagnose.h>
 
-#define REG_ENSURE(c, m)   _REG_ENSURE(c, OSL_THIS_FILE, __LINE__, m)
+#define REG_ENSURE(c, m)   _REG_ENSURE(c, __FILE__, __LINE__, m)
 
 #define _REG_ENSURE(c, f, l, m) \
     do \


More information about the Libreoffice-commits mailing list