diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-08 15:07:06 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-08 15:07:06 +0300 |
| commit | 256f1925826436ed8902848369a5744b4d2f22b8 (patch) | |
| tree | 4f93fcb4969c6a4a350bc8fa5fe611fb8c255d57 /sal/inc | |
| parent | Introduced OSL_FORMAT, adpated some places to it. (diff) | |
| download | core-256f1925826436ed8902848369a5744b4d2f22b8.tar.gz core-256f1925826436ed8902848369a5744b4d2f22b8.zip | |
Revert "Introduced OSL_FORMAT, adpated some places to it."
Breaks the MSVC build for me: 'osl_detail_formatString' : C linkage
function cannot return C++ class 'rtl::OString'.
This reverts commit 6b900b8bede24c8710d62e9e7cbff613a0b12f9f.
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/osl/diagnose.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h index 1e4dd1360c59..ab5243fe94d5 100644 --- a/sal/inc/osl/diagnose.h +++ b/sal/inc/osl/diagnose.h @@ -192,26 +192,6 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf #define OSL_THIS_FUNC "" #endif -#if defined __cplusplus - -namespace rtl { class OString; } - -/** @internal */ -extern "C" ::rtl::OString SAL_CALL osl_detail_formatString( - char const * format, ...) SAL_THROW_EXTERN_C(); - -/** A facility for printf-style messages in OSL_ENSURE, OSL_FAIL, etc. - - Use like: OSL_ENSURE(i == 5, OSL_FORMAT("i should be 5 but is %d", i)); -*/ -#define OSL_FORMAT(format, ...) \ - (::osl_detail_formatString(format, __VA_ARGS__).getStr()) - // it appears that all relevant compilers (esp. GCC 4.0 and MS VS 2008 - // Express) already support variadic macros in C++; see also - // <http://wiki.apache.org/stdcxx/C++0xCompilerSupport> - -#endif - #endif /* _OSL_DIAGNOSE_H_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |