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

Unified Diff: webrtc/modules/audio_processing/transient/wpd_tree.cc

Issue 1698843003: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/transient/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: compile fix Created 4 years, 10 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
Index: webrtc/modules/audio_processing/transient/wpd_tree.cc
diff --git a/webrtc/modules/audio_processing/transient/wpd_tree.cc b/webrtc/modules/audio_processing/transient/wpd_tree.cc
index 227b48ade6adfe4c99cdb64708de46b8149bb4d7..28cbb046ac698f7e4e1058b10254c5660e161916 100644
--- a/webrtc/modules/audio_processing/transient/wpd_tree.cc
+++ b/webrtc/modules/audio_processing/transient/wpd_tree.cc
@@ -14,7 +14,6 @@
#include <math.h>
#include <string.h>
-#include "webrtc/base/scoped_ptr.h"
aluebs-webrtc 2016/02/16 16:20:10 Add <memory> include?
kwiberg-webrtc 2016/02/17 03:06:30 No, the .h file already does that.
aluebs-webrtc 2016/02/17 03:15:59 I brushed up my style-guide knowledge and you are
kwiberg-webrtc 2016/02/17 03:25:31 I'd gloat, except I didn't know better either unti
#include "webrtc/modules/audio_processing/transient/dyadic_decimator.h"
#include "webrtc/modules/audio_processing/transient/wpd_node.h"
@@ -32,7 +31,7 @@ WPDTree::WPDTree(size_t data_length, const float* high_pass_coefficients,
levels > 0);
// Size is 1 more, so we can use the array as 1-based. nodes_[0] is never
// allocated.
- nodes_.reset(new rtc::scoped_ptr<WPDNode>[num_nodes_ + 1]);
+ nodes_.reset(new std::unique_ptr<WPDNode>[num_nodes_ + 1]);
// Create the first node
const float kRootCoefficient = 1.f; // Identity Coefficient.
« no previous file with comments | « webrtc/modules/audio_processing/transient/wpd_tree.h ('k') | webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698