generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly define OVERRIDE when building with g++ 4.7 and C++11 support

Browse Source 
g++ 4.7 and later support explicit virtual overrides when building with C++11 support
enabled. However, libjingle does not detect that and makes OVERRIDE a no-op.

This CL updates base/common.h to define OVERRIDE properly when g++ 4.7 is used with
C++11 support enabled.

See this page for GCC support of C++11 features:
http://gcc.gnu.org/projects/cxx0x.html

R=fischman@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/5159004

Patch from Chris Dumez <ch.dumez@samsung.com>.

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5255 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2013-12-11 00:07:11 +00:00
parent 7ae8495779
commit 77507eff4f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/base/common.h
View File

@ -187,6 +187,10 @@ inline bool ImplicitCastToBool(bool result) { return result; }
// (because it won't see this pragma).
#pragma clang diagnostic ignored "-Wc++11-extensions"
#define OVERRIDE override
#elif defined(__GNUC__) && __cplusplus >= 201103 && \
(__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40700
// GCC 4.7 supports explicit virtual overrides when C++11 support is enabled.
#define OVERRIDE override
#else
#define OVERRIDE
#endif