| Index: base/android/scoped_java_ref.h
|
| diff --git a/base/android/scoped_java_ref.h b/base/android/scoped_java_ref.h
|
| index 8dcf2bca0398319305f1854ef4e264b5771f1c99..a1b4b13f6da0116e00e64c0db3a86770fb1441a6 100644
|
| --- a/base/android/scoped_java_ref.h
|
| +++ b/base/android/scoped_java_ref.h
|
| @@ -8,10 +8,11 @@
|
| #include <jni.h>
|
| #include <stddef.h>
|
|
|
| +#include <type_traits>
|
| +
|
| #include "base/base_export.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| -#include "base/template_util.h"
|
|
|
| namespace base {
|
| namespace android {
|
| @@ -193,7 +194,7 @@ class ScopedJavaLocalRef : public JavaRef<T> {
|
|
|
| template<typename U>
|
| void Reset(JNIEnv* env, U obj) {
|
| - static_assert(base::is_convertible<U, T>::value,
|
| + static_assert(std::is_convertible<U, T>::value,
|
| "U must be convertible to T");
|
| env_ = this->SetNewLocalRef(env, obj);
|
| }
|
| @@ -264,7 +265,7 @@ class ScopedJavaGlobalRef : public JavaRef<T> {
|
|
|
| template<typename U>
|
| void Reset(JNIEnv* env, U obj) {
|
| - static_assert(base::is_convertible<U, T>::value,
|
| + static_assert(std::is_convertible<U, T>::value,
|
| "U must be convertible to T");
|
| this->SetNewGlobalRef(env, obj);
|
| }
|
|
|