Browse Source

GL: expand the Clang-CL warning suppression to regular Clang as well.

Both are a thing on Windows, so both need the same.
pull/638/head
Vladimír Vondruš 2 years ago
parent
commit
e56e5e9b31
  1. 9
      src/Magnum/GL/Context.cpp

9
src/Magnum/GL/Context.cpp

@ -673,9 +673,10 @@ Context* currentContext = nullptr;
called from. To avoid #ifdef hell in code below, the currentContext is called from. To avoid #ifdef hell in code below, the currentContext is
redefined to return a value from this uniqueness-ensuring function. */ redefined to return a value from this uniqueness-ensuring function. */
#if defined(CORRADE_TARGET_WINDOWS) && defined(MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS) && !defined(CORRADE_TARGET_WINDOWS_RT) #if defined(CORRADE_TARGET_WINDOWS) && defined(MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS) && !defined(CORRADE_TARGET_WINDOWS_RT)
/* Clang-CL complains that the function has a return type incompatible with C. /* Clang-CL (and regular Clang as well) complains that the function has a
I don't care, I only need an unmangled name to look up later at runtime. */ return type incompatible with C. I don't care, I only need an unmangled name
#ifdef CORRADE_TARGET_CLANG_CL to look up later at runtime. */
#ifdef CORRADE_TARGET_CLANG
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wreturn-type-c-linkage" #pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
#endif #endif
@ -683,7 +684,7 @@ extern "C" CORRADE_VISIBILITY_EXPORT Context*& magnumGLUniqueCurrentContext();
extern "C" CORRADE_VISIBILITY_EXPORT Context*& magnumGLUniqueCurrentContext() { extern "C" CORRADE_VISIBILITY_EXPORT Context*& magnumGLUniqueCurrentContext() {
return currentContext; return currentContext;
} }
#ifdef CORRADE_TARGET_CLANG_CL #ifdef CORRADE_TARGET_CLANG
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif

Loading…
Cancel
Save