2
0
Эх сурвалжийг харах

Don't define String operator bool when compiling w/ clang on windows

Fixes compile errors building with clang-cl, which doesn't define __GNUC__
in MS compatibility mode.
Ben Payne 10 жил өмнө
parent
commit
608a43ba2a

+ 1 - 2
Engine/source/core/util/str.h

@@ -292,11 +292,10 @@ private:
    // causes an ambiguous cast compile error.  Making it private is simply
    // causes an ambiguous cast compile error.  Making it private is simply
    // more insurance that it isn't used on different compilers.
    // more insurance that it isn't used on different compilers.
    // NOTE: disable on GCC since it causes hyper casting to U32 on gcc.
    // NOTE: disable on GCC since it causes hyper casting to U32 on gcc.
-#ifndef TORQUE_COMPILER_GCC
+#if !defined(TORQUE_COMPILER_GCC) && !defined(__clang__)
    operator const bool() const { return false; }
    operator const bool() const { return false; }
 #endif
 #endif
 
 
-
    static void copy(StringChar *dst, const StringChar *src, U32 size);
    static void copy(StringChar *dst, const StringChar *src, U32 size);
 
 
    StringData   *_string;
    StringData   *_string;