Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / re2 / util / util.h

diff --git a/src/third_party/re2/util/util.h b/src/third_party/re2/util/util.h
index 49159c2..8350445 100644 (file)
--- a/src/third_party/re2/util/util.h
+++ b/src/third_party/re2/util/util.h
@@ -79,9 +79,13 @@ typedef unsigned int uint;
 typedef unsigned short ushort;
 
 // COMPILE_ASSERT causes a compile error about msg if expr is not true.
+#if __cplusplus >= 201103L
+#define COMPILE_ASSERT(expr, msg) static_assert(expr, #msg)
+#else
 template<bool> struct CompileAssert {};
 #define COMPILE_ASSERT(expr, msg) \
   typedef CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1]
+#endif
 
 // DISALLOW_EVIL_CONSTRUCTORS disallows the copy and operator= functions.
 // It goes in the private: declarations in a class.