diff options
author | 2015-11-16 13:05:37 -0800 | |
---|---|---|
committer | 2015-11-16 13:05:37 -0800 | |
commit | 566b23c571dbec97925ad0c44e744126a62e5a1e (patch) | |
tree | 05e55fc33a38394f582b3fae0f91b3f9affaacd3 /src/core | |
parent | 755c553c17b82bb5de3d9cc8d3b2a866ff9e9e50 (diff) |
Revert of skstd -> std for unique_ptr (patchset #9 id:160001 of https://codereview.chromium.org/1436033003/ )
Reason for revert:
10.9 bots are too old too.
Original issue's description:
> skstd -> std for unique_ptr
>
> TBR=reed@google.com
> No public API changes.
>
> BUG=skia:4564
>
> Committed: https://skia.googlesource.com/skia/+/755c553c17b82bb5de3d9cc8d3b2a866ff9e9e50
TBR=bungeman@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4564
Review URL: https://codereview.chromium.org/1446413002
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkSharedMutex.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkSharedMutex.h b/src/core/SkSharedMutex.h index 21c9f46d64..840c2d36ad 100644 --- a/src/core/SkSharedMutex.h +++ b/src/core/SkSharedMutex.h @@ -14,7 +14,7 @@ #ifdef SK_DEBUG #include "SkMutex.h" - #include <memory> + #include "SkUniquePtr.h" #endif // SK_DEBUG // There are two shared lock implementations one debug the other is high performance. They implement @@ -50,9 +50,9 @@ public: private: #ifdef SK_DEBUG class ThreadIDSet; - std::unique_ptr<ThreadIDSet> fCurrentShared; - std::unique_ptr<ThreadIDSet> fWaitingExclusive; - std::unique_ptr<ThreadIDSet> fWaitingShared; + skstd::unique_ptr<ThreadIDSet> fCurrentShared; + skstd::unique_ptr<ThreadIDSet> fWaitingExclusive; + skstd::unique_ptr<ThreadIDSet> fWaitingShared; int fSharedQueueSelect{0}; mutable SkMutex fMu; SkSemaphore fSharedQueue[2]; |