Index: android/scoped_java_ref.cc |
diff --git a/android/scoped_java_ref.cc b/android/scoped_java_ref.cc |
index bb6f5032fe3454dfc2011c5a6a38c603714a84c5..4d4ef6da191ecba41239f0c7578f57d5e1204571 100644 |
--- a/android/scoped_java_ref.cc |
+++ b/android/scoped_java_ref.cc |
@@ -28,16 +28,15 @@ ScopedJavaLocalFrame::ScopedJavaLocalFrame(JNIEnv* env, int capacity) |
ScopedJavaLocalFrame::~ScopedJavaLocalFrame() { env_->PopLocalFrame(NULL); } |
-JavaRef<jobject>::JavaRef() : obj_(NULL) {} |
- |
+#if DCHECK_IS_ON() |
+// This constructor is inlined when DCHECKs are disabled; don't add anything |
+// else here. |
JavaRef<jobject>::JavaRef(JNIEnv* env, jobject obj) : obj_(obj) { |
if (obj) { |
DCHECK(env && env->GetObjectRefType(obj) == JNILocalRefType); |
} |
} |
- |
-JavaRef<jobject>::~JavaRef() { |
-} |
+#endif |
JNIEnv* JavaRef<jobject>::SetNewLocalRef(JNIEnv* env, jobject obj) { |
if (!env) { |