diff options
| author | dcheng <dcheng@chromium.org> | 2016-01-15 10:05:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-15 18:07:07 +0000 |
| commit | a416317a60e8b9a4a9274e2c02f450b89a358a0d (patch) | |
| tree | a2ba637c593be5c61f195e29a816baa4d31a2124 /base | |
| parent | 1c392f8d584a4ccae3264679483d26bdaddb146f (diff) | |
| download | chromium_src-a416317a60e8b9a4a9274e2c02f450b89a358a0d.zip chromium_src-a416317a60e8b9a4a9274e2c02f450b89a358a0d.tar.gz chromium_src-a416317a60e8b9a4a9274e2c02f450b89a358a0d.tar.bz2 | |
Reland of move Pass on OS X. (patchset #1 id:1 of https://codereview.chromium.org/1597543002/ )
Reason for revert:
Relanding per discussion: dcheng will fix official builders,
while this patch will remain in-tree to prevent regressions.
Original issue's description:
> Revert of Remove Pass on OS X. (patchset #1 id:1 of https://codereview.chromium.org/1586743002/ )
>
> Reason for revert:
> This has broken compiles on this Mac bot: https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Mac/builds/6887
>
> Original issue's description:
> > Remove Pass on OS X.
> >
> > 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
> >
> > Committed: https://crrev.com/04e90d5757b393018d1b608fd67608d460bb97f6
> > Cr-Commit-Position: refs/heads/master@{#369765}
>
> TBR=danakj@chromium.org,dcheng@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=557422
>
> Committed: https://crrev.com/1c392f8d584a4ccae3264679483d26bdaddb146f
> Cr-Commit-Position: refs/heads/master@{#369787}
TBR=danakj@chromium.org,samuong@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=557422
Review URL: https://codereview.chromium.org/1583283005
Cr-Commit-Position: refs/heads/master@{#369788}
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 4f0e784..8bea43b 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) +#if !defined(OS_ANDROID) && !defined(OS_LINUX) && !defined(OS_MACOSX) // 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 24bf9d75..0af416e 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) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) #define DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(type) \ private: \ type(const type&) = delete; \ |