diff options
Diffstat (limited to 'webrtc/modules/audio_processing/transient/wpd_tree.h')
| -rw-r--r-- | webrtc/modules/audio_processing/transient/wpd_tree.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/webrtc/modules/audio_processing/transient/wpd_tree.h b/webrtc/modules/audio_processing/transient/wpd_tree.h index 7f0fc79..c54220f 100644 --- a/webrtc/modules/audio_processing/transient/wpd_tree.h +++ b/webrtc/modules/audio_processing/transient/wpd_tree.h @@ -8,11 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ -#define WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ +#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ +#define MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ -#include "webrtc/base/scoped_ptr.h" -#include "webrtc/modules/audio_processing/transient/wpd_node.h" +#include <stddef.h> + +#include <memory> + +#include "modules/audio_processing/transient/wpd_node.h" namespace webrtc { @@ -46,9 +49,7 @@ class WPDTree { ~WPDTree(); // Returns the number of nodes at any given level. - static int NumberOfNodesAtLevel(int level) { - return 1 << level; - } + static int NumberOfNodesAtLevel(int level) { return 1 << level; } // Returns a pointer to the node at the given level and index(of that level). // Level goes from 0 to levels(). @@ -83,9 +84,9 @@ class WPDTree { size_t data_length_; int levels_; int num_nodes_; - rtc::scoped_ptr<rtc::scoped_ptr<WPDNode>[]> nodes_; + std::unique_ptr<std::unique_ptr<WPDNode>[]> nodes_; }; } // namespace webrtc -#endif // WEBRTC_MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ +#endif // MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_ |