include/osl/diagnose.h | 6 ------ registry/test/regdiagnose.h | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-)
New commits: commit df2c663fef3435a8c3d541b364780876229ccd29 Author: Michaël Lefèvre <[email protected]> Date: Mon Apr 7 16:10:57 2014 +0200 fdo#43157 [API CHANGE] Remove deprecated _OSL_GLOBAL Signed-off-by: Stephan Bergmann <[email protected]> Conflicts: include/osl/diagnose.h Change-Id: Ie2e6b7a8546318bdd8b81261bef46bf92c0c125f diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h index 4137d21..e64160c 100644 --- a/include/osl/diagnose.h +++ b/include/osl/diagnose.h @@ -114,12 +114,6 @@ #define OSL_POSTCOND(c, m) OSL_ENSURE(c, m) -#ifdef __cplusplus -#define _OSL_GLOBAL :: -#else -#define _OSL_GLOBAL -#endif /* __cplusplus */ - /* the macro OSL_THIS_FUNC is intended to be an office internal macro for now */ /* copied from boost/current_function.hpp to make it usable from C * sources as well diff --git a/registry/test/regdiagnose.h b/registry/test/regdiagnose.h index 721db1d..1ac6e92 100644 --- a/registry/test/regdiagnose.h +++ b/registry/test/regdiagnose.h @@ -28,8 +28,8 @@ #define _REG_ENSURE(c, f, l, m) \ do \ { \ - if (!(c) && _OSL_GLOBAL osl_assertFailedLine(f, l, m)) \ - _OSL_GLOBAL osl_breakDebug(); \ + if (!(c) && :: osl_assertFailedLine(f, l, m)) \ + :: osl_breakDebug(); \ } while (0)
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
