games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

clang compile\warning fixes

Browse Source
This commit is contained in:
Ivan Savenko 2013-04-05 21:27:24 +00:00
parent 0baa261dfc
commit 0d3ec3c6da
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Global.h
View File

@ -40,12 +40,12 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
#endif #endif
//nullptr - only msvc and gcc-4.6 or later, othervice define it as NULL //nullptr - only msvc and gcc-4.6 or later, othervice define it as NULL
#if !defined(_MSC_VER) && !(defined(__GNUC__) && (GCC_VERSION >= 460)) #if !defined(_MSC_VER) && !(defined(__GNUC__) && (GCC_VERSION >= 460)) && !(defined(__clang__))
#define nullptr NULL #define nullptr NULL
#endif #endif
//override keyword - only msvc and gcc-4.7 or later. //override keyword - only msvc and gcc-4.7 or later.
#if !defined(_MSC_VER) && !(defined(__GNUC__) && (GCC_VERSION >= 470)) #if !defined(_MSC_VER) && !(defined(__GNUC__) && (GCC_VERSION >= 470)) && !(defined(__clang__))
#define override #define override
#endif #endif

2
lib/Logging/CLogConsoleTarget.h
View File

@ -16,7 +16,7 @@
#include "CLogFormatter.h" #include "CLogFormatter.h"
#include "CConsoleHandler.h" #include "CConsoleHandler.h"
class LogRecord; struct LogRecord;
/** /**
* The color mapping maps a logger name and a level to a specific color. * The color mapping maps a logger name and a level to a specific color.

2
lib/Logging/CLogFormatter.h
View File

@ -11,7 +11,7 @@
#pragma once #pragma once
class LogRecord; struct LogRecord;
/** /**
* The log formatter formats log records. * The log formatter formats log records.

2
lib/Logging/CLogger.h
View File

@ -12,7 +12,7 @@
#pragma once #pragma once
class CGLogger; class CGLogger;
class LogRecord; struct LogRecord;
class ILogTarget; class ILogTarget;
namespace ELogLevel namespace ELogLevel

2
lib/Logging/ILogTarget.h
View File

@ -11,7 +11,7 @@
#pragma once #pragma once
class LogRecord; struct LogRecord;
/** /**
* The interface log target is used by all log target implementations. It holds * The interface log target is used by all log target implementations. It holds