diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-12 15:18:58 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-12 15:24:49 +0200 |
| commit | a9966a47409a0149d936ba2a2650bc20cc52cce2 (patch) | |
| tree | 50f2cdef25277dece8571ac83d82b720461d93a1 /sal/inc/osl | |
| parent | 49b8408e028881b8628ca472a028318ec7b32282 (diff) | |
WaE: C-linkage specified, but returns user-defined type
Clang says: 'osl_detail_ObjectRegistry_getMutex' has C-linkage
specified, but returns user-defined type '::osl::Mutex &' which is
incompatible with C.
Let's continue disabling that warning also also in 4.0 and later.
Change-Id: I892bdc7e7aa6d546adf6b1c388e4c149db738948
Diffstat (limited to 'sal/inc/osl')
| -rw-r--r-- | sal/inc/osl/diagnose.hxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx index 2c7e8c001039..7ae155449cc0 100644 --- a/sal/inc/osl/diagnose.hxx +++ b/sal/inc/osl/diagnose.hxx @@ -76,7 +76,6 @@ SAL_DLLPUBLIC void SAL_CALL osl_detail_ObjectRegistry_revokeObject( // These functions presumably should not be extern "C", but changing // that would break binary compatibility. -#if SUPD < 400 #ifdef __clang__ #pragma clang diagnostic push // Guard against slightly older clang versions that don't have @@ -84,14 +83,13 @@ SAL_DLLPUBLIC void SAL_CALL osl_detail_ObjectRegistry_revokeObject( #pragma clang diagnostic ignored "-Wunknown-pragmas" #pragma clang diagnostic ignored "-Wreturn-type-c-linkage" #endif -#endif + SAL_DLLPUBLIC ::osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex() SAL_THROW_EXTERN_C(); -#if SUPD < 400 + #ifdef __clang__ #pragma clang diagnostic pop #endif -#endif } // extern "C" |