diff options
| author | dcheng <dcheng@chromium.org> | 2016-01-06 19:54:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-07 03:55:51 +0000 |
| commit | 78820a435f2d94fb08e9a4cdb810b811c6cbdea9 (patch) | |
| tree | 33eb650d474ab5e92e50be3937449520230df396 /base | |
| parent | 61c6efc1ab75a9f5de0f32a8132ac58422ee800a (diff) | |
| download | chromium_src-78820a435f2d94fb08e9a4cdb810b811c6cbdea9.zip chromium_src-78820a435f2d94fb08e9a4cdb810b811c6cbdea9.tar.gz chromium_src-78820a435f2d94fb08e9a4cdb810b811c6cbdea9.tar.bz2 | |
Remove Pass on CrOS.
Pass() is a legacy of the original C++03 move emulation implementation.
New code should use std::move from <utility>.
BUG=557422
R=danakj@chromium.org,sandersd@chromium.org,spang@chromium.org
TBR=reveman@chromium.org,sky@chromium.org
Review URL: https://codereview.chromium.org/1553263002
Cr-Commit-Position: refs/heads/master@{#368009}
Diffstat (limited to 'base')
| -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 f091596..4f0e784 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_ANDROID) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))) +#if !defined(OS_ANDROID) && !defined(OS_LINUX) // 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 66d8521..24bf9d75 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_ANDROID) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) +#if defined(OS_ANDROID) || defined(OS_LINUX) #define DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(type) \ private: \ type(const type&) = delete; \ |