Merge branch 'override-keyword' into tracerestrict
This commit is contained in:
11
src/stdafx.h
11
src/stdafx.h
@@ -514,4 +514,15 @@ static inline void free(const void *ptr)
|
|||||||
#define IGNORE_UNINITIALIZED_WARNING_STOP
|
#define IGNORE_UNINITIALIZED_WARNING_STOP
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Conditional define for the override keyword.
|
||||||
|
* Use of the override keyword can prevent various types of problems when the base method signature is changed, but derived overriding methods are not
|
||||||
|
* This is conditional to maintain compatibility with legacy compilers
|
||||||
|
*/
|
||||||
|
#if __cplusplus >= 201103L || defined(__STDCXX_VERSION__) || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__)
|
||||||
|
#define OVERRIDE override
|
||||||
|
#else
|
||||||
|
#define OVERRIDE
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* STDAFX_H */
|
#endif /* STDAFX_H */
|
||||||
|
Reference in New Issue
Block a user