Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5786)

Unified Diff: base/android/jni_android.cc

Issue 1467003002: Switch to static_assert in base/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: / Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/atomicops_internals_x86_msvc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/jni_android.cc
diff --git a/base/android/jni_android.cc b/base/android/jni_android.cc
index 3db0fc8be8ce9bb3cb6477fab01bbc2ffdc8b016..6e272d513436b2bb106d7b707ddc97a996f6f5bb 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 can't be smaller than jclass");
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 can't be smaller than jMethodID");
subtle::AtomicWord value = base::subtle::Acquire_Load(atomic_method_id);
if (value)
return reinterpret_cast<jmethodID>(value);
« no previous file with comments | « no previous file | base/atomicops_internals_x86_msvc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698