diff options
| -rw-r--r-- | base/memory/scoped_ptr_unittest.cc | 2 | ||||
| -rw-r--r-- | base/move.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/memory/scoped_ptr_unittest.cc b/base/memory/scoped_ptr_unittest.cc index 24d43c5..f091596 100644 --- a/base/memory/scoped_ptr_unittest.cc +++ b/base/memory/scoped_ptr_unittest.cc @@ -402,7 +402,7 @@ TEST(ScopedPtrTest, MoveBehavior) { EXPECT_TRUE(scoper3.get()); } -#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) +#if !(defined(OS_ANDROID) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))) // Test uncaught Pass() does not have side effects, because Pass() // is implemented by std::move(). // TODO(danakj): Remove this test case when we remove Pass(). diff --git a/base/move.h b/base/move.h index 482ee81..66d8521 100644 --- a/base/move.h +++ b/base/move.h @@ -31,7 +31,7 @@ // for more details. // TODO(crbug.com/566182): Remove this macro and use DISALLOW_COPY_AND_ASSIGN // everywhere instead. -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #define DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(type) \ private: \ type(const type&) = delete; \ |