TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fixes compile errors building with clang-cl, which doesn't define __GNUC__
in MS compatibility mode.
This commit is contained in:
Ben Payne 2015-03-04 18:57:08 -05:00
parent 7f1f6a5e8b
commit 608a43ba2a
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/core/util/str.h
View file

@ -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;