Index: base/memory/scoped_ptr.h |
diff --git a/base/memory/scoped_ptr.h b/base/memory/scoped_ptr.h |
index b14287ceb85d5bcfff88ead9c11eab699c523960..bcab101a559e6df99bc21d4455ce1a513a41ca15 100644 |
--- a/base/memory/scoped_ptr.h |
+++ b/base/memory/scoped_ptr.h |
@@ -102,7 +102,6 @@ |
#include "base/logging.h" |
#include "base/macros.h" |
#include "base/move.h" |
-#include "base/template_util.h" |
#include "build/build_config.h" |
namespace base { |
@@ -179,8 +178,8 @@ namespace internal { |
template <typename T> struct IsNotRefCounted { |
enum { |
- value = !base::is_convertible<T*, base::subtle::RefCountedBase*>::value && |
- !base::is_convertible<T*, base::subtle::RefCountedThreadSafeBase*>:: |
+ value = !std::is_convertible<T*, base::subtle::RefCountedBase*>::value && |
+ !std::is_convertible<T*, base::subtle::RefCountedThreadSafeBase*>:: |
value |
}; |
}; |