Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1102)

Unified Diff: src/core/SkSharedMutex.h

Issue 1446413002: Revert of skstd -> std for unique_ptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/android/SkBitmapRegionDecoder.cpp ('k') | tests/CPlusPlusEleven.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkSharedMutex.h
diff --git a/src/core/SkSharedMutex.h b/src/core/SkSharedMutex.h
index 21c9f46d64058f28e4d1273d5b40095340a8a4dd..840c2d36adf152b50087675eb1140c78001dd407 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 @@
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];
« no previous file with comments | « src/android/SkBitmapRegionDecoder.cpp ('k') | tests/CPlusPlusEleven.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698