Switch to static_assert in base/.

base/android/jni_android.cc

Index: base/android/jni_android.cc
diff --git a/base/android/jni_android.cc b/base/android/jni_android.cc
index 3db0fc8be8ce9bb3cb6477fab01bbc2ffdc8b016..dbd5de6592211491240cf63aef56c6c06f60e44e 100644
--- a/base/android/jni_android.cc
+++ b/base/android/jni_android.cc
@@ -143,8 +143,8 @@ jclass LazyGetClass(
     JNIEnv* env,
     const char* class_name,
     base::subtle::AtomicWord* atomic_class_id) {
-  COMPILE_ASSERT(sizeof(subtle::AtomicWord) >= sizeof(jclass),
-                 AtomicWord_SmallerThan_jMethodID);
+  static_assert(sizeof(subtle::AtomicWord) >= sizeof(jclass),
+                "AtomicWord_SmallerThan_jMethodID");

[Mostyn Bramley-Moore, 2015/11/23 06:44:14]

s/jMethodID/jclass/ ?

[Mark Mentovai, 2015/11/23 14:21:37]

Can you get rid of the underscores now that we’re doing this transformation too?
This can be a mechanical transformation: it’s probably pretty easy to sed the
diff you’ve already produced to make a new diff that uses spaces instead of
underscores.

   subtle::AtomicWord value = base::subtle::Acquire_Load(atomic_class_id);
   if (value)
     return reinterpret_cast<jclass>(value);
@@ -188,8 +188,8 @@ jmethodID MethodID::LazyGet(JNIEnv* env,
                             const char* method_name,
                             const char* jni_signature,
                             base::subtle::AtomicWord* atomic_method_id) {
-  COMPILE_ASSERT(sizeof(subtle::AtomicWord) >= sizeof(jmethodID),
-                 AtomicWord_SmallerThan_jMethodID);
+  static_assert(sizeof(subtle::AtomicWord) >= sizeof(jmethodID),
+                "AtomicWord_SmallerThan_jMethodID");
   subtle::AtomicWord value = base::subtle::Acquire_Load(atomic_method_id);
   if (value)
     return reinterpret_cast<jmethodID>(value);