Index: base/scoped_generic.h |
diff --git a/base/scoped_generic.h b/base/scoped_generic.h |
index d41f19512ced12ffcdba043e3dae49a06570f5c9..84de6b7d50df4ac3ef02859d8e9a90708a5641ea 100644 |
--- a/base/scoped_generic.h |
+++ b/base/scoped_generic.h |
@@ -11,7 +11,6 @@ |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/move.h" |
namespace base { |
@@ -54,8 +53,6 @@ namespace base { |
// typedef ScopedGeneric<int, FooScopedTraits> ScopedFoo; |
template<typename T, typename Traits> |
class ScopedGeneric { |
- DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(ScopedGeneric) |
- |
private: |
// This must be first since it's used inline below. |
// |
@@ -160,6 +157,8 @@ class ScopedGeneric { |
const ScopedGeneric<T2, Traits2>& p2) const; |
Data data_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(ScopedGeneric); |
}; |
template<class T, class Traits> |