Index: webrtc/base/taskparent.h |
diff --git a/webrtc/base/taskparent.h b/webrtc/base/taskparent.h |
index 41008fa98ee57a4ddfac20d87fc782e5496ac3e9..3c0b81cf6a98ff0266e305a1edab57c297451d19 100644 |
--- a/webrtc/base/taskparent.h |
+++ b/webrtc/base/taskparent.h |
@@ -11,10 +11,11 @@ |
#ifndef WEBRTC_BASE_TASKPARENT_H__ |
#define WEBRTC_BASE_TASKPARENT_H__ |
+#include <memory> |
#include <set> |
#include "webrtc/base/basictypes.h" |
-#include "webrtc/base/scoped_ptr.h" |
+#include "webrtc/base/constructormagic.h" |
namespace rtc { |
@@ -52,7 +53,7 @@ class TaskParent { |
TaskRunner *runner_; |
bool child_error_; |
typedef std::set<Task *> ChildSet; |
- scoped_ptr<ChildSet> children_; |
+ std::unique_ptr<ChildSet> children_; |
RTC_DISALLOW_COPY_AND_ASSIGN(TaskParent); |
}; |