zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent some compiler warnings when using clang. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5585 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2017-11-28 21:54:18 +00:00
parent fc1b290951
commit 6a05db3a0a
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/IrrCompileConfig.h
View File

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

2
include/irrTypes.h
View File

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

4
source/Irrlicht/Irrlicht.cpp
View File

@ -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 <windows.h>
@ -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;