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

Unified Diff: base/memory/scoped_ptr.h

Issue 1763983002: Change scoped_ptr to a type alias for std::unique_ptr on OS_WIN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bluetooth Created 4 years, 9 months 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 | « no previous file | base/memory/scoped_ptr_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/scoped_ptr.h
diff --git a/base/memory/scoped_ptr.h b/base/memory/scoped_ptr.h
index b14287ceb85d5bcfff88ead9c11eab699c523960..3520a019567526210433e776eeeb982a525ea014 100644
--- a/base/memory/scoped_ptr.h
+++ b/base/memory/scoped_ptr.h
@@ -123,7 +123,7 @@ struct FreeDeleter {
// Now that scoped_ptr is almost 100% compatible with std::unique_ptr, we're
// incrementally migrating scoped_ptr to just be a type alias for
// std::unique_ptr. The eventual goal is to delete scoped_ptr altogether.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_WIN)
template <typename T, typename D = std::default_delete<T>>
using scoped_ptr = std::unique_ptr<T, D>;
« no previous file with comments | « no previous file | base/memory/scoped_ptr_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698