diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h index 82baf126..f74137e4 100644 --- a/include/IrrCompileConfig.h +++ b/include/IrrCompileConfig.h @@ -781,6 +781,10 @@ precision will be lower but speed higher. currently X86 only #endif #endif +#ifndef __has_feature + #define __has_feature(x) 0 // Compatibility with non-clang compilers. +#endif + #ifdef _DEBUG //! A few attributes are written in CSceneManager when _IRR_SCENEMANAGER_DEBUG is enabled // NOTE: Those attributes were used always until 1.8.0 and became a global define for 1.8.1 diff --git a/include/irrTypes.h b/include/irrTypes.h index 9911b21e..cadb157f 100644 --- a/include/irrTypes.h +++ b/include/irrTypes.h @@ -210,7 +210,7 @@ virtual void somefunc() _IRR_OVERRIDE_; #define _IRR_OVERRIDE_ override #elif (_MSC_VER >= 1600 ) /* supported since MSVC 2010 */ #define _IRR_OVERRIDE_ override -#elif (__clang_major__ >= 3) +#elif (__clang_major__ >= 3 && __has_feature(cxx_override_control)) #define _IRR_OVERRIDE_ override #else #define _IRR_OVERRIDE_ diff --git a/source/Irrlicht/Irrlicht.cpp b/source/Irrlicht/Irrlicht.cpp index c1abeb74..b40bec67 100644 --- a/source/Irrlicht/Irrlicht.cpp +++ b/source/Irrlicht/Irrlicht.cpp @@ -4,7 +4,7 @@ #include "IrrCompileConfig.h" -static const char* const copyright = "Irrlicht Engine (c) 2002-2012 Nikolaus Gebhardt"; +static const char* const copyright = "Irrlicht Engine (c) 2002-2017 Nikolaus Gebhardt"; // put string in binary #ifdef _IRR_WINDOWS_ #include @@ -46,6 +46,8 @@ namespace irr u32 bits, bool fullscreen, bool stencilbuffer, bool vsync, IEventReceiver* res) { + (void)copyright; // prevent unused variable warning + SIrrlichtCreationParameters p; p.DriverType = driverType; p.WindowSize = windowSize;