diff options
-rw-r--r-- | include/osl/diagnose.h | 6 | ||||
-rw-r--r-- | registry/test/regdiagnose.h | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h index 4137d21c6c5b..e64160c3d894 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 721db1d6c512..1ac6e92bb029 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) |