diff options
author | Haavard <havardpe@yahoo-inc.com> | 2017-03-09 14:29:06 +0000 |
---|---|---|
committer | Haavard <havardpe@yahoo-inc.com> | 2017-03-09 14:29:06 +0000 |
commit | 537b3df072372ccc899ca1e5914da766db746376 (patch) | |
tree | 25342a7efcbc0b3da8223072c2349e57f8ba8126 /vespalib | |
parent | 91c372691e007f0ada9dfd7acb22fa2b1aba0433 (diff) |
use std::unique_ptr instead of vespalib::LinkedPtr
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/vespa/vespalib/util/overview.h | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/util/simple_thread_bundle.cpp | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/util/simple_thread_bundle.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vespalib/src/vespa/vespalib/util/overview.h b/vespalib/src/vespa/vespalib/util/overview.h index 89ca7edb931..0a1f0b1e427 100644 --- a/vespalib/src/vespa/vespalib/util/overview.h +++ b/vespalib/src/vespa/vespalib/util/overview.h @@ -38,7 +38,7 @@ * vespalib::Atomic * <BR> vespalib::ReferenceCounter * - * Simple smart pointers + * Simple smart pointers (deprecated) * * \ref vespalib::SharedPtr<T> * <BR> \ref vespalib::LinkedPtr<T> diff --git a/vespalib/src/vespa/vespalib/util/simple_thread_bundle.cpp b/vespalib/src/vespa/vespalib/util/simple_thread_bundle.cpp index ef3010e082d..ad287c54d6a 100644 --- a/vespalib/src/vespa/vespalib/util/simple_thread_bundle.cpp +++ b/vespalib/src/vespa/vespalib/util/simple_thread_bundle.cpp @@ -123,7 +123,7 @@ SimpleThreadBundle::SimpleThreadBundle(size_t size_in, Strategy strategy) _hook = std::move(hook); } else { size_t signal_idx = (strategy == USE_BROADCAST) ? 0 : (i - 1); - _workers.push_back(Worker::LP(new Worker(_signals[signal_idx], std::move(hook)))); + _workers.push_back(std::make_unique<Worker>(_signals[signal_idx], std::move(hook))); } } } diff --git a/vespalib/src/vespa/vespalib/util/simple_thread_bundle.h b/vespalib/src/vespa/vespalib/util/simple_thread_bundle.h index 0852329d039..f06de87ed31 100644 --- a/vespalib/src/vespa/vespalib/util/simple_thread_bundle.h +++ b/vespalib/src/vespa/vespalib/util/simple_thread_bundle.h @@ -107,7 +107,7 @@ public: private: struct Worker : Runnable, noncopyable { - typedef LinkedPtr<Worker> LP; + using UP = std::unique_ptr<Worker>; Thread thread; Signal &signal; Runnable::UP hook; @@ -123,7 +123,7 @@ private: Work _work; std::vector<Signal> _signals; - std::vector<Worker::LP> _workers; + std::vector<Worker::UP> _workers; Runnable::UP _hook; public: |