summaryrefslogtreecommitdiff
path: root/typedefs.h
diff options
context:
space:
mode:
authorpbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-05-08 08:34:34 +0000
committerpbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-05-08 08:34:34 +0000
commitd7ebd68418078c255a1381d673bc99f340c174c4 (patch)
tree0ae2d36709eee381c99c92594a3602c1b50a8aa1 /typedefs.h
parent9ccfe4629f0f138360b0bc406a76db07b9098a4a (diff)
downloadwebrtc-d7ebd68418078c255a1381d673bc99f340c174c4.tar.gz
Disable clang C++11 warnings to permit OVERRIDE keyword.
BUG=1623 R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1431004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3980 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'typedefs.h')
-rw-r--r--typedefs.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/typedefs.h b/typedefs.h
index 7edb12c0..37c8fc9c 100644
--- a/typedefs.h
+++ b/typedefs.h
@@ -83,6 +83,11 @@ typedef unsigned __int64 uint64_t;
#if defined(_MSC_VER)
#define OVERRIDE override
#elif defined(__clang__)
+// Clang defaults to C++03 and warns about using override. Squelch that.
+// Intentionally no push/pop here so all users of OVERRIDE ignore the warning
+// too. This is like passing -Wno-c++11-extensions, except that GCC won't die
+// (because it won't see this pragma).
+#pragma clang diagnostic ignored "-Wc++11-extensions"
#define OVERRIDE override
#else
#define OVERRIDE