From cd8844b4093f3c3778db8ad56353188d2dbdba31 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Thu, 5 Jan 2017 00:56:46 +0100 Subject: [PATCH] clean-up: kill Boost scoped_ptr std::unique_ptr is a drop-in replacement --- admin/scons/Platform.py | 2 -- src/backend/real-clock.hpp | 1 - src/common/appstate.cpp | 12 +++++----- src/common/appstate.hpp | 9 ++++---- src/common/guifacade.cpp | 6 ++--- src/common/query/defs-manager.hpp | 6 ++--- src/common/query/query-resolver.hpp | 5 ++-- src/gui/panel/timeline-panel-obsolete.hpp | 2 +- src/gui/widget/timeline/timeline-body.cpp | 2 +- src/gui/widget/timeline/timeline-body.hpp | 4 ++-- src/gui/widget/timeline/timeline-track.hpp | 4 ++-- src/lib/allocation-cluster.hpp | 2 -- src/lib/lifecycleregistry.hpp | 23 ++++++++++--------- src/lib/scoped-holder.hpp | 11 ++++----- src/lib/test/depend-4test.hpp | 8 +++---- src/proc/asset/struct.hpp | 6 ++--- src/proc/control/stypemanager.cpp | 2 +- src/proc/control/stypemanager.hpp | 4 ++-- src/proc/engine/buffer-provider.hpp | 6 ++--- src/proc/engine/calc-stream.hpp | 1 - .../engine/diagnostic-buffer-provider.hpp | 4 ++-- src/proc/engine/engine-diagnostics.hpp | 1 - src/proc/engine/engine-service-mock.cpp | 1 - src/proc/engine/engine-service-mock.hpp | 2 -- src/proc/engine/engine-service.cpp | 1 - src/proc/engine/engine-service.hpp | 1 - src/proc/engine/nodewiring-def.hpp | 2 -- src/proc/engine/nodewiring.hpp | 4 ++-- .../engine/tracking-heap-block-provider.hpp | 10 ++++---- src/proc/mobject/builder/operationpoint.hpp | 4 ++-- src/proc/mobject/builder/toolfactory.cpp | 6 ++--- src/proc/mobject/builder/toolfactory.hpp | 3 +-- src/proc/mobject/session/fixture.hpp | 7 +++--- src/proc/mobject/session/locatingpin.cpp | 5 ++-- src/proc/mobject/session/locatingpin.hpp | 5 ++-- .../placement-index-query-resolver.cpp | 6 ++--- src/proc/mobject/session/placement-index.hpp | 8 +++---- src/proc/mobject/session/scope-locator.hpp | 6 ++--- .../mobject/session/sess-manager-impl.cpp | 8 +++---- .../mobject/session/sess-manager-impl.hpp | 4 ++-- src/proc/play/dummy-play-connection.cpp | 1 - src/proc/play/dummy-play-connection.hpp | 1 - src/proc/play/dummy-player-service.cpp | 18 +++++++-------- src/proc/play/dummy-player-service.hpp | 8 +++---- src/proc/play/output-director.cpp | 8 +++---- src/proc/play/output-director.hpp | 9 ++++---- src/proc/play/output-slot-connection.hpp | 2 -- src/proc/play/output-slot.hpp | 6 ++--- src/proc/play/play-controller.cpp | 1 - src/proc/play/play-controller.hpp | 1 - src/proc/play/play-process.cpp | 1 - src/proc/play/play-process.hpp | 1 - src/proc/play/play-service.cpp | 1 - src/proc/play/play-service.hpp | 5 ++-- src/proc/play/render-configurator.cpp | 1 - src/proc/play/render-configurator.hpp | 3 +-- src/proc/play/timings.hpp | 1 - tests/core/proc/engine/buff-table-test.cpp | 4 ++-- .../proc/engine/buffer-metadata-key-test.cpp | 2 -- .../core/proc/engine/buffer-metadata-test.cpp | 6 ++--- tests/core/proc/engine/calc-stream-test.cpp | 1 - .../proc/engine/dispatcher-interface-test.cpp | 1 - .../proc/engine/engine-interface-test.cpp | 1 - tests/core/proc/engine/testframe-test.cpp | 9 ++++---- tests/core/proc/engine/testframe.cpp | 5 ++-- .../session/defs-registry-impl-test.cpp | 6 ++--- .../session/session-service-access-test.cpp | 8 ++++--- .../core/proc/play/diagnostic-output-slot.hpp | 1 - 68 files changed, 137 insertions(+), 179 deletions(-) diff --git a/admin/scons/Platform.py b/admin/scons/Platform.py index 2d7a41a97..41d983ab3 100644 --- a/admin/scons/Platform.py +++ b/admin/scons/Platform.py @@ -86,8 +86,6 @@ def configure(env): problems.append('We need boost::noncopyable') if not conf.CheckCXXHeader('boost/lexical_cast.hpp'): problems.append('We need boost::lexical_cast') - if not conf.CheckCXXHeader('boost/scoped_ptr.hpp'): - problems.append('We need boost::scoped_ptr (scoped_ptr.hpp).') if not conf.CheckCXXHeader('boost/format.hpp'): problems.append('We need boost::format (header).') if not conf.CheckLibWithHeader('boost_program_options','boost/program_options.hpp','C++'): diff --git a/src/backend/real-clock.hpp b/src/backend/real-clock.hpp index 4d65f9852..482d667d6 100644 --- a/src/backend/real-clock.hpp +++ b/src/backend/real-clock.hpp @@ -53,7 +53,6 @@ //#include //#include //#include -//#include //namespace lib { //namespace time{ diff --git a/src/common/appstate.cpp b/src/common/appstate.cpp index b8977786b..8d4bfbf92 100644 --- a/src/common/appstate.cpp +++ b/src/common/appstate.cpp @@ -40,7 +40,7 @@ extern "C" { using util::cStr; using lib::Literal; - +using std::unique_ptr; @@ -77,10 +77,10 @@ namespace lumiera { * @note all further application startup is conducted by \c main.cpp */ AppState::AppState() - : setup_(LUMIERA_LOCATION_OF_BOOTSTRAP_INI) - , subsystems_(0) - , emergency_(false) - , core_up_ (false) + : setup_{LUMIERA_LOCATION_OF_BOOTSTRAP_INI} + , subsystems_{} + , emergency_{false} + , core_up_{false} { } @@ -89,7 +89,7 @@ namespace lumiera { AppState& AppState::instance() // Meyer's singleton { - static scoped_ptr theApp_ (0); + static unique_ptr theApp_; if (!theApp_) theApp_.reset (new AppState ()); return *theApp_; } diff --git a/src/common/appstate.hpp b/src/common/appstate.hpp index b32177576..6f75f04ed 100644 --- a/src/common/appstate.hpp +++ b/src/common/appstate.hpp @@ -46,7 +46,7 @@ #include "common/basic-setup.hpp" #include -#include +#include #include #include @@ -55,7 +55,6 @@ namespace lumiera { using std::string; - using boost::scoped_ptr; using boost::noncopyable; class SubsystemRunner; @@ -74,8 +73,8 @@ namespace lumiera { private: AppState (); - ~AppState (); - friend void boost::checked_delete(AppState*); + ~AppState (); + friend class std::default_delete; public: @@ -131,7 +130,7 @@ namespace lumiera { private: - typedef scoped_ptr PSub; + using PSub = std::unique_ptr; BasicSetup setup_; diff --git a/src/common/guifacade.cpp b/src/common/guifacade.cpp index 2854d978b..c43c11002 100644 --- a/src/common/guifacade.cpp +++ b/src/common/guifacade.cpp @@ -29,7 +29,7 @@ #include "lib/functor-util.hpp" #include "common/instancehandle.hpp" -#include +#include #include #include @@ -37,7 +37,7 @@ namespace gui { using std::string; - using boost::scoped_ptr; + using std::unique_ptr; using std::bind; using std::placeholders::_1; using lumiera::Subsys; @@ -81,7 +81,7 @@ namespace gui { namespace { // implementation of GUI-"Subsystem" : start GUI through GuiStarterPlugin - scoped_ptr facade (0); + unique_ptr facade; class GuiSubsysDescriptor diff --git a/src/common/query/defs-manager.hpp b/src/common/query/defs-manager.hpp index 1338f3a91..ceaeab848 100644 --- a/src/common/query/defs-manager.hpp +++ b/src/common/query/defs-manager.hpp @@ -28,8 +28,8 @@ #include "lib/p.hpp" #include "common/query.hpp" -#include #include +#include @@ -38,7 +38,7 @@ namespace query { using lumiera::Query; - using boost::scoped_ptr; + using std::unique_ptr; namespace impl { class DefsRegistry; } @@ -59,7 +59,7 @@ namespace query { */ class DefsManager : private boost::noncopyable { - scoped_ptr defsRegistry_; + unique_ptr defsRegistry_; public: diff --git a/src/common/query/query-resolver.hpp b/src/common/query/query-resolver.hpp index 9f67675f0..39e8dea4f 100644 --- a/src/common/query/query-resolver.hpp +++ b/src/common/query/query-resolver.hpp @@ -28,7 +28,6 @@ #include "common/query.hpp" #include -#include #include #include #include @@ -38,7 +37,7 @@ using std::function; namespace lumiera { using boost::noncopyable; - using boost::scoped_ptr; + using std::unique_ptr; using std::string; @@ -98,7 +97,7 @@ namespace lumiera { class QueryResolver : noncopyable { - scoped_ptr dispatcher_; + unique_ptr dispatcher_; public: diff --git a/src/gui/panel/timeline-panel-obsolete.hpp b/src/gui/panel/timeline-panel-obsolete.hpp index e65fc3810..0c003175c 100644 --- a/src/gui/panel/timeline-panel-obsolete.hpp +++ b/src/gui/panel/timeline-panel-obsolete.hpp @@ -154,7 +154,7 @@ namespace model{ sigc::connection sequenceChooserChangedConnection; // Body Widgets - boost::scoped_ptr timelineWidget; + std::unique_ptr timelineWidget; std::map< weak_ptr , shared_ptr diff --git a/src/gui/widget/timeline/timeline-body.cpp b/src/gui/widget/timeline/timeline-body.cpp index 15acdd6c1..1d0b4e335 100644 --- a/src/gui/widget/timeline/timeline-body.cpp +++ b/src/gui/widget/timeline/timeline-body.cpp @@ -46,7 +46,7 @@ namespace timeline { TimelineBody::TimelineBody (TimelineWidget &timelineWidget) : Glib::ObjectBase("TimelineBody") - , tool(NULL) + , tool() , mouseDownX(0) , mouseDownY(0) , dragType(None) diff --git a/src/gui/widget/timeline/timeline-body.hpp b/src/gui/widget/timeline/timeline-body.hpp index f31380f0d..a2ef4e29f 100644 --- a/src/gui/widget/timeline/timeline-body.hpp +++ b/src/gui/widget/timeline/timeline-body.hpp @@ -31,7 +31,7 @@ #include "gui/widget/timeline/timeline-tool.hpp" #include "lib/time/timevalue.hpp" -#include +#include namespace gui { @@ -188,7 +188,7 @@ private: Shift }; - boost::scoped_ptr tool; + std::unique_ptr tool; double mouseDownX, mouseDownY; // Scroll State diff --git a/src/gui/widget/timeline/timeline-track.hpp b/src/gui/widget/timeline/timeline-track.hpp index c418294f5..e82e73ac2 100644 --- a/src/gui/widget/timeline/timeline-track.hpp +++ b/src/gui/widget/timeline/timeline-track.hpp @@ -36,7 +36,7 @@ #include "gui/widget/timeline/timeline-header-widget.hpp" #include "lib/time/timevalue.hpp" -#include +#include namespace gui { @@ -235,7 +235,7 @@ namespace timeline { /** * An internal timer used for the expand/collapse animation. */ - boost::scoped_ptr expand_timer; + std::unique_ptr expand_timer; //----- Header Widgets ------// diff --git a/src/lib/allocation-cluster.hpp b/src/lib/allocation-cluster.hpp index e9185ba70..1a2928b37 100644 --- a/src/lib/allocation-cluster.hpp +++ b/src/lib/allocation-cluster.hpp @@ -52,7 +52,6 @@ #include "lib/scoped-holder.hpp" #include "lib/scoped-holder-transfer.hpp" -#include #include #include @@ -60,7 +59,6 @@ namespace lib { - using boost::scoped_ptr; /** * A pile of objects sharing common allocation and lifecycle. diff --git a/src/lib/lifecycleregistry.hpp b/src/lib/lifecycleregistry.hpp index a78170988..eb3865af9 100644 --- a/src/lib/lifecycleregistry.hpp +++ b/src/lib/lifecycleregistry.hpp @@ -38,22 +38,23 @@ #ifndef LUMIERA_LIFECYCLEREGISTRY_H #define LUMIERA_LIFECYCLEREGISTRY_H -#include -#include -#include -#include -#include -#include #include "lib/util.hpp" +#include +#include +#include +#include +#include +#include + namespace lumiera { - using boost::scoped_ptr; using boost::noncopyable; - using std::function; using util::contains; + using std::unique_ptr; + using std::function; using std::string; @@ -95,7 +96,7 @@ namespace lumiera { * @warning don't use it after the end of main()! */ static LifecycleRegistry& instance() // Meyer's singleton { - static scoped_ptr theRegistry_; + static unique_ptr theRegistry_; if (!theRegistry_) theRegistry_.reset (new LifecycleRegistry ()); return *theRegistry_; } @@ -108,8 +109,8 @@ namespace lumiera { execute (ON_BASIC_INIT); // just to be sure, typically a NOP, because nothing is registered yet } - ~LifecycleRegistry () {} - friend void boost::checked_delete(LifecycleRegistry*); + ~LifecycleRegistry () { } + friend class std::default_delete; }; diff --git a/src/lib/scoped-holder.hpp b/src/lib/scoped-holder.hpp index 379a3f802..484ce7c9d 100644 --- a/src/lib/scoped-holder.hpp +++ b/src/lib/scoped-holder.hpp @@ -58,10 +58,9 @@ #ifndef LIB_SCOPED_HOLDER_H #define LIB_SCOPED_HOLDER_H -#include - #include "lib/error.hpp" +#include namespace lib { @@ -76,9 +75,9 @@ namespace lib { */ template class ScopedPtrHolder - : public boost::scoped_ptr + : public std::unique_ptr { - typedef boost::scoped_ptr _Parent; + typedef std::unique_ptr _Parent; static B* must_be_null (_Parent const& ptr) { @@ -89,8 +88,8 @@ namespace lib { } public: - ScopedPtrHolder () - : _Parent(0) + ScopedPtrHolder() + : _Parent{} { } template diff --git a/src/lib/test/depend-4test.hpp b/src/lib/test/depend-4test.hpp index 968376e05..b2abb385f 100644 --- a/src/lib/test/depend-4test.hpp +++ b/src/lib/test/depend-4test.hpp @@ -30,9 +30,9 @@ #include "lib/depend.hpp" #include "lib/meta/duck-detector.hpp" -#include #include #include +#include namespace lib { @@ -100,12 +100,12 @@ namespace test{ { typedef typename ServiceInterface::Type Interface; - boost::scoped_ptr mock_; + std::unique_ptr mock_; Interface* shadowedOriginal_; Depend4Test() - : mock_(new TYPE) - , shadowedOriginal_(Depend::injectReplacement (mock_.get())) + : mock_{new TYPE} + , shadowedOriginal_{Depend::injectReplacement (mock_.get())} { } ~Depend4Test() diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp index 02bf26129..56b54f271 100644 --- a/src/proc/asset/struct.hpp +++ b/src/proc/asset/struct.hpp @@ -64,7 +64,7 @@ #include "common/query.hpp" #include -#include +#include #include @@ -73,7 +73,7 @@ namespace proc { namespace asset { using std::string; - using boost::scoped_ptr; + using std::unique_ptr; using lumiera::Query; using lib::Symbol; @@ -142,7 +142,7 @@ namespace asset { class StructFactory : boost::noncopyable { - scoped_ptr impl_; + unique_ptr impl_; protected: StructFactory (); diff --git a/src/proc/control/stypemanager.cpp b/src/proc/control/stypemanager.cpp index bcfaa5fbe..dbaa8e42b 100644 --- a/src/proc/control/stypemanager.cpp +++ b/src/proc/control/stypemanager.cpp @@ -36,7 +36,7 @@ namespace control { STypeManager::STypeManager() - : reg_(0) + : reg_{} { reset(); } diff --git a/src/proc/control/stypemanager.hpp b/src/proc/control/stypemanager.hpp index 81262a4ee..91952ff1d 100644 --- a/src/proc/control/stypemanager.hpp +++ b/src/proc/control/stypemanager.hpp @@ -28,7 +28,7 @@ #include "proc/streamtype.hpp" #include "lib/depend.hpp" -#include +#include namespace proc { @@ -41,7 +41,7 @@ namespace control { { class Registry; - boost::scoped_ptr reg_; + std::unique_ptr reg_; public: static lib::Depend instance; diff --git a/src/proc/engine/buffer-provider.hpp b/src/proc/engine/buffer-provider.hpp index a8f306f80..fd4a4db5f 100644 --- a/src/proc/engine/buffer-provider.hpp +++ b/src/proc/engine/buffer-provider.hpp @@ -50,14 +50,14 @@ #include "proc/engine/buffer-local-key.hpp" #include -#include +#include namespace proc { namespace engine { - using boost::scoped_ptr; using lib::Literal; + using std::unique_ptr; class BufferMetadata; @@ -81,7 +81,7 @@ namespace engine { class BufferProvider : boost::noncopyable { - scoped_ptr meta_; + unique_ptr meta_; protected: /* === for Implementation by concrete providers === */ diff --git a/src/proc/engine/calc-stream.hpp b/src/proc/engine/calc-stream.hpp index 9713b4491..3b7ae9b2d 100644 --- a/src/proc/engine/calc-stream.hpp +++ b/src/proc/engine/calc-stream.hpp @@ -36,7 +36,6 @@ //#include "lib/singleton-ref.hpp" // //#include -//#include //#include #include diff --git a/src/proc/engine/diagnostic-buffer-provider.hpp b/src/proc/engine/diagnostic-buffer-provider.hpp index 18636d7dc..fcb453fd9 100644 --- a/src/proc/engine/diagnostic-buffer-provider.hpp +++ b/src/proc/engine/diagnostic-buffer-provider.hpp @@ -36,8 +36,8 @@ #include "proc/engine/type-handler.hpp" #include "proc/engine/buffer-provider.hpp" -#include #include +#include namespace proc { @@ -62,7 +62,7 @@ namespace engine { : boost::noncopyable { - boost::scoped_ptr pImpl_; + std::unique_ptr pImpl_; static lib::Depend diagnostics; diff --git a/src/proc/engine/engine-diagnostics.hpp b/src/proc/engine/engine-diagnostics.hpp index 26c93bcfb..f53d460cd 100644 --- a/src/proc/engine/engine-diagnostics.hpp +++ b/src/proc/engine/engine-diagnostics.hpp @@ -51,7 +51,6 @@ //#include "lib/depend.hpp" // #include -//#include //#include diff --git a/src/proc/engine/engine-service-mock.cpp b/src/proc/engine/engine-service-mock.cpp index 899e21af9..ca7eb4e72 100644 --- a/src/proc/engine/engine-service-mock.cpp +++ b/src/proc/engine/engine-service-mock.cpp @@ -27,7 +27,6 @@ //#include //#include //#include -//#include diff --git a/src/proc/engine/engine-service-mock.hpp b/src/proc/engine/engine-service-mock.hpp index bb43e466f..85cc461bf 100644 --- a/src/proc/engine/engine-service-mock.hpp +++ b/src/proc/engine/engine-service-mock.hpp @@ -54,8 +54,6 @@ #include "lib/scoped-ptrvect.hpp" // #include -//#include -//#include namespace proc { diff --git a/src/proc/engine/engine-service.cpp b/src/proc/engine/engine-service.cpp index c936e4904..c810afad7 100644 --- a/src/proc/engine/engine-service.cpp +++ b/src/proc/engine/engine-service.cpp @@ -27,7 +27,6 @@ //#include //#include #include -//#include diff --git a/src/proc/engine/engine-service.hpp b/src/proc/engine/engine-service.hpp index 2d7a40707..92642d5c9 100644 --- a/src/proc/engine/engine-service.hpp +++ b/src/proc/engine/engine-service.hpp @@ -64,7 +64,6 @@ #include "lib/depend.hpp" // #include -//#include #include //#include diff --git a/src/proc/engine/nodewiring-def.hpp b/src/proc/engine/nodewiring-def.hpp index d9827b72e..cdd4f5f6d 100644 --- a/src/proc/engine/nodewiring-def.hpp +++ b/src/proc/engine/nodewiring-def.hpp @@ -45,8 +45,6 @@ #include "lib/util-foreach.hpp" #include -//#include -//#include diff --git a/src/proc/engine/nodewiring.hpp b/src/proc/engine/nodewiring.hpp index d420643f7..3eb3172cb 100644 --- a/src/proc/engine/nodewiring.hpp +++ b/src/proc/engine/nodewiring.hpp @@ -30,7 +30,7 @@ #include "proc/engine/nodewiring-def.hpp" //#include -#include +#include //#include @@ -85,7 +85,7 @@ namespace engine { class WiringFactory { lib::AllocationCluster& alloc_; - boost::scoped_ptr pImpl_; + std::unique_ptr pImpl_; public: WiringFactory (lib::AllocationCluster& a); diff --git a/src/proc/engine/tracking-heap-block-provider.hpp b/src/proc/engine/tracking-heap-block-provider.hpp index 1e8c47096..e352ce604 100644 --- a/src/proc/engine/tracking-heap-block-provider.hpp +++ b/src/proc/engine/tracking-heap-block-provider.hpp @@ -49,8 +49,7 @@ #include "lib/scoped-ptrvect.hpp" #include -#include -#include +#include namespace proc { @@ -63,8 +62,7 @@ namespace engine { namespace diagn { - using boost::scoped_ptr; - using boost::scoped_array; + using std::unique_ptr; /** @@ -75,7 +73,7 @@ namespace engine { class Block : boost::noncopyable { - scoped_array storage_; + unique_ptr storage_; bool was_released_; @@ -130,7 +128,7 @@ namespace engine { class TrackingHeapBlockProvider : public BufferProvider { - scoped_ptr pool_; + unique_ptr pool_; ScopedPtrVect outSeq_; public: diff --git a/src/proc/mobject/builder/operationpoint.hpp b/src/proc/mobject/builder/operationpoint.hpp index 09b54fd81..e92505bb7 100644 --- a/src/proc/mobject/builder/operationpoint.hpp +++ b/src/proc/mobject/builder/operationpoint.hpp @@ -28,7 +28,7 @@ //#include "common/query.hpp" #include "lib/hash-standard.hpp" -#include +#include #include #include @@ -56,7 +56,7 @@ namespace builder { */ class OperationPoint { - boost::scoped_ptr refPoint_; + std::unique_ptr refPoint_; public: OperationPoint (engine::NodeFactory&, asset::Media const& srcMedia); diff --git a/src/proc/mobject/builder/toolfactory.cpp b/src/proc/mobject/builder/toolfactory.cpp index b116ea62f..9245f7d3a 100644 --- a/src/proc/mobject/builder/toolfactory.cpp +++ b/src/proc/mobject/builder/toolfactory.cpp @@ -33,7 +33,7 @@ namespace builder { using util::isnil; using std::auto_ptr; - using boost::scoped_ptr; + using std::unique_ptr; struct BuildProcessState @@ -42,8 +42,8 @@ namespace builder { session::Fixture & fixedTimeline_; auto_ptr procSegment_; - scoped_ptr segmentation_; - scoped_ptr fabrication_; + unique_ptr segmentation_; + unique_ptr fabrication_; BuildProcessState (session::Fixture& theTimeline) diff --git a/src/proc/mobject/builder/toolfactory.hpp b/src/proc/mobject/builder/toolfactory.hpp index b30b90907..80fc001fe 100644 --- a/src/proc/mobject/builder/toolfactory.hpp +++ b/src/proc/mobject/builder/toolfactory.hpp @@ -30,7 +30,6 @@ #include "proc/mobject/builder/mould.hpp" #include "proc/engine/rendergraph.hpp" -#include #include @@ -50,7 +49,7 @@ namespace builder { */ class ToolFactory { - boost::scoped_ptr state_; + std::unique_ptr state_; public: /** prepare a builder tool kit for dealing with the given Fixture, diff --git a/src/proc/mobject/session/fixture.hpp b/src/proc/mobject/session/fixture.hpp index 4b40b3b93..4aae36b47 100644 --- a/src/proc/mobject/session/fixture.hpp +++ b/src/proc/mobject/session/fixture.hpp @@ -29,13 +29,14 @@ #include "proc/mobject/explicitplacement.hpp" #include "proc/mobject/session/auto.hpp" -#include #include -#include +#include +#include using std::list; using std::shared_ptr; +using std::unique_ptr; @@ -55,7 +56,7 @@ namespace session { protected: /////////////////////////////////////////////////TODO: placeholder code list content_; - boost::scoped_ptr partitioning_; + unique_ptr partitioning_; /////////////////////////////////////////////////TICKET #573 who creates the fixture? diff --git a/src/proc/mobject/session/locatingpin.cpp b/src/proc/mobject/session/locatingpin.cpp index de85b98f3..6f509e6b1 100644 --- a/src/proc/mobject/session/locatingpin.cpp +++ b/src/proc/mobject/session/locatingpin.cpp @@ -27,13 +27,14 @@ #include "proc/mobject/session/fixedlocation.hpp" #include "proc/mobject/session/relativelocation.hpp" +using std::unique_ptr; namespace proc { namespace mobject { namespace session { inline LocatingPin* - cloneChain (const scoped_ptr& chain) + cloneChain (const unique_ptr& chain) { if (!chain) return 0; @@ -77,7 +78,7 @@ namespace session { return next_->addChain (newLp); else { - scoped_ptr tmp_next (newLp); + unique_ptr tmp_next (newLp); tmp_next->next_.swap(next_); next_.swap(tmp_next); return *newLp; diff --git a/src/proc/mobject/session/locatingpin.hpp b/src/proc/mobject/session/locatingpin.hpp index b74df98e2..025e29a3b 100644 --- a/src/proc/mobject/session/locatingpin.hpp +++ b/src/proc/mobject/session/locatingpin.hpp @@ -52,8 +52,7 @@ #include #include -#include -using boost::scoped_ptr; + @@ -107,7 +106,7 @@ namespace mobject { struct LocatingSolution; /** next additional Pin, if any */ - scoped_ptr next_; + std::unique_ptr next_; /** order to consider when resolving. 0=highest */ virtual int getPrioLevel () const { return 0; } diff --git a/src/proc/mobject/session/placement-index-query-resolver.cpp b/src/proc/mobject/session/placement-index-query-resolver.cpp index 1eb803b77..540f3677f 100644 --- a/src/proc/mobject/session/placement-index-query-resolver.cpp +++ b/src/proc/mobject/session/placement-index-query-resolver.cpp @@ -29,7 +29,7 @@ #include "proc/mobject/test-dummy-mobject.hpp" /////////////////////////////////////TICKET #532 -#include +#include #include @@ -37,7 +37,7 @@ namespace proc { namespace mobject { namespace session { - using boost::scoped_ptr; + using std::unique_ptr; using lumiera::Goal; using lumiera::Query; @@ -198,7 +198,7 @@ namespace session { { ContentFilter acceptable_; ExplorerBuilder buildExploartion_; - scoped_ptr explore_; + unique_ptr explore_; virtual Result diff --git a/src/proc/mobject/session/placement-index.hpp b/src/proc/mobject/session/placement-index.hpp index fd97380b5..e459ebbea 100644 --- a/src/proc/mobject/session/placement-index.hpp +++ b/src/proc/mobject/session/placement-index.hpp @@ -113,9 +113,9 @@ #include "proc/mobject/placement.hpp" #include "proc/mobject/placement-ref.hpp" -#include #include -#include +#include +#include #include namespace std { @@ -145,7 +145,7 @@ namespace session { LUMIERA_ERROR_DECLARE (NONEMPTY_SCOPE); ///< Placement scope (still) contains other elements - using boost::scoped_ptr; + using std::unique_ptr; /** @@ -182,7 +182,7 @@ namespace session { class Table; class Validator; - scoped_ptr pTab_; + unique_ptr
pTab_; typedef PlacementMO::ID _PID; diff --git a/src/proc/mobject/session/scope-locator.hpp b/src/proc/mobject/session/scope-locator.hpp index 1105c5b2a..2042a19e7 100644 --- a/src/proc/mobject/session/scope-locator.hpp +++ b/src/proc/mobject/session/scope-locator.hpp @@ -30,15 +30,13 @@ #include "lib/iter-source.hpp" ////////////////////TICKET #493 : the bare interface would be sufficient here #include "lib/depend.hpp" -#include +#include namespace proc { namespace mobject { namespace session { - using boost::scoped_ptr; - class QueryFocusStack; class ScopePath; @@ -60,7 +58,7 @@ namespace session { */ class ScopeLocator { - scoped_ptr focusStack_; + std::unique_ptr focusStack_; public: static lib::Depend instance; diff --git a/src/proc/mobject/session/sess-manager-impl.cpp b/src/proc/mobject/session/sess-manager-impl.cpp index f4dcb6ecd..87f8a73df 100644 --- a/src/proc/mobject/session/sess-manager-impl.cpp +++ b/src/proc/mobject/session/sess-manager-impl.cpp @@ -48,7 +48,7 @@ #include "common/query/defs-manager.hpp" #include "common/query.hpp" -using boost::scoped_ptr; +#include @@ -94,7 +94,7 @@ namespace session { namespace { // defining details of the Session Lifecycle - typedef scoped_ptr SessionPImpl; + using SessionPImpl = std::unique_ptr; class SessionLifecycleDetails : public LifecycleAdvisor @@ -210,8 +210,8 @@ namespace session { * \link #operator-> access \endlink to the session object. */ SessManagerImpl::SessManagerImpl () throw() - : pSess_ (0) - , lifecycle_(new SessionLifecycleDetails(pSess_)) + : pSess_{} + , lifecycle_{new SessionLifecycleDetails(pSess_)} { Session::initFlag = true; //////////////////////////////////////// TICKET #518 instead of this hack, implement basic-init of the session manager for real } diff --git a/src/proc/mobject/session/sess-manager-impl.hpp b/src/proc/mobject/session/sess-manager-impl.hpp index c74e1efbb..59d6bf3e4 100644 --- a/src/proc/mobject/session/sess-manager-impl.hpp +++ b/src/proc/mobject/session/sess-manager-impl.hpp @@ -46,8 +46,8 @@ namespace session { : public SessManager , public Sync { - scoped_ptr pSess_; - scoped_ptr lifecycle_; + unique_ptr pSess_; + unique_ptr lifecycle_; SessManagerImpl() throw(); friend class lib::DependencyFactory; diff --git a/src/proc/play/dummy-play-connection.cpp b/src/proc/play/dummy-play-connection.cpp index 9691f9dd6..4be7d7a9f 100644 --- a/src/proc/play/dummy-play-connection.cpp +++ b/src/proc/play/dummy-play-connection.cpp @@ -29,7 +29,6 @@ //#include //#include //#include -//#include diff --git a/src/proc/play/dummy-play-connection.hpp b/src/proc/play/dummy-play-connection.hpp index 81ac36b5e..3892b13ca 100644 --- a/src/proc/play/dummy-play-connection.hpp +++ b/src/proc/play/dummy-play-connection.hpp @@ -96,7 +96,6 @@ #include "lib/iter-source.hpp" // #include -//#include //#include #include diff --git a/src/proc/play/dummy-player-service.cpp b/src/proc/play/dummy-player-service.cpp index c59043745..a18b23b09 100644 --- a/src/proc/play/dummy-player-service.cpp +++ b/src/proc/play/dummy-player-service.cpp @@ -30,10 +30,9 @@ extern "C" { #include "common/interface-descriptor.h" } -#include -#include #include -#include +#include +#include @@ -43,7 +42,6 @@ namespace proc { using std::string; using lumiera::Subsys; using std::auto_ptr; - using boost::scoped_ptr; using std::bind; @@ -74,7 +72,7 @@ namespace proc { } /** manages the actual (single) instance of the player service impl */ - scoped_ptr thePlayer_; + std::unique_ptr thePlayer_; void @@ -277,11 +275,11 @@ namespace proc { ProcessImpl::ProcessImpl(LumieraDisplaySlot viewerHandle) - : fps_(0) - , play_(false) - , display_(Display::facade().getHandle (viewerHandle)) - , imageGen_(0) - , tick_(new TickService (bind (&ProcessImpl::doFrame, this))) + : fps_{0} + , play_{false} + , display_{Display::facade().getHandle (viewerHandle)} + , imageGen_{} + , tick_{new TickService (bind (&ProcessImpl::doFrame, this))} { } diff --git a/src/proc/play/dummy-player-service.hpp b/src/proc/play/dummy-player-service.hpp index f46b2f7da..c82409e16 100644 --- a/src/proc/play/dummy-player-service.hpp +++ b/src/proc/play/dummy-player-service.hpp @@ -47,7 +47,7 @@ #include "lib/singleton-ref.hpp" #include -#include +#include #include @@ -84,9 +84,9 @@ namespace proc { uint fps_; bool play_; - Display::Sink display_; - boost::scoped_ptr imageGen_; - boost::scoped_ptr tick_; + Display::Sink display_; + std::unique_ptr imageGen_; + std::unique_ptr tick_; public: diff --git a/src/proc/play/output-director.cpp b/src/proc/play/output-director.cpp index 416445700..a8a5aafcd 100644 --- a/src/proc/play/output-director.cpp +++ b/src/proc/play/output-director.cpp @@ -65,7 +65,7 @@ namespace play { OutputDirector::connectUp() { Lock sync(this); - REQUIRE (!shutdown_initiated_); + REQUIRE (not shutdown_initiated_); player_.reset (new PlayService); return this->isOperational(); @@ -90,9 +90,9 @@ namespace play { * immediate unconditional termination of the application. */ void - OutputDirector::triggerDisconnect (SigTerm completedSignal) throw() + OutputDirector::triggerDisconnect (SigTerm completedSignal) noexcept { - if (!shutdown_initiated_) + if (not shutdown_initiated_) { shutdown_initiated_ = true; Thread ("Output shutdown supervisor", bind (&OutputDirector::bringDown, this, completedSignal)); @@ -114,7 +114,7 @@ namespace play { { Lock sync(this); string problemLog; - if (!isOperational()) + if (not isOperational()) { WARN (play, "Attempt to OutputDirector::bringDown() -- " "which it is not in running state. Invocation ignored. " diff --git a/src/proc/play/output-director.hpp b/src/proc/play/output-director.hpp index 90dc27245..84ecb3691 100644 --- a/src/proc/play/output-director.hpp +++ b/src/proc/play/output-director.hpp @@ -44,8 +44,7 @@ #include //#include //#include -//#include -#include +#include namespace proc { @@ -54,7 +53,7 @@ namespace play { //using std::string; //using std::vector; //using std::shared_ptr; - using boost::scoped_ptr; + using std::unique_ptr; class PlayService; @@ -75,7 +74,7 @@ namespace play { { typedef lumiera::Subsys::SigTerm SigTerm; - scoped_ptr player_; + unique_ptr player_; ///////TODO more components and connections to manage here... bool shutdown_initiated_ = false; /////TODO probably need a way more elaborate lifecylce management @@ -84,7 +83,7 @@ namespace play { static lib::Depend instance; bool connectUp() ; - void triggerDisconnect(SigTerm) throw(); + void triggerDisconnect(SigTerm) noexcept; bool isOperational() const; diff --git a/src/proc/play/output-slot-connection.hpp b/src/proc/play/output-slot-connection.hpp index 0bba60baf..33ddf3068 100644 --- a/src/proc/play/output-slot-connection.hpp +++ b/src/proc/play/output-slot-connection.hpp @@ -51,7 +51,6 @@ //#include "lib/sync.hpp" #include -#include //#include #include #include @@ -72,7 +71,6 @@ namespace play { //using std::bind; using std::vector; //using std::shared_ptr; - using boost::scoped_ptr; diff --git a/src/proc/play/output-slot.hpp b/src/proc/play/output-slot.hpp index cc93f08ef..3dbfe87d5 100644 --- a/src/proc/play/output-slot.hpp +++ b/src/proc/play/output-slot.hpp @@ -74,7 +74,7 @@ #include "lib/iter-source.hpp" #include -#include +#include namespace proc { @@ -86,7 +86,7 @@ namespace play { using lib::time::TimeValue; using lib::time::Time; - using boost::scoped_ptr; + using std::unique_ptr; @@ -116,7 +116,7 @@ namespace play { /** active connections through this OutputSlot */ class ConnectionState; - scoped_ptr state_; + unique_ptr state_; /** build the \em connected state, * based on the existing configuration diff --git a/src/proc/play/play-controller.cpp b/src/proc/play/play-controller.cpp index 09cc8c4a7..8c25f62b2 100644 --- a/src/proc/play/play-controller.cpp +++ b/src/proc/play/play-controller.cpp @@ -42,7 +42,6 @@ //#include //#include //#include -//#include namespace lumiera { diff --git a/src/proc/play/play-controller.hpp b/src/proc/play/play-controller.hpp index a6910209d..3bb16e876 100644 --- a/src/proc/play/play-controller.hpp +++ b/src/proc/play/play-controller.hpp @@ -38,7 +38,6 @@ //#include "lib/singleton-ref.hpp" #include -//#include //#include diff --git a/src/proc/play/play-process.cpp b/src/proc/play/play-process.cpp index c412e8a8f..8db9f7820 100644 --- a/src/proc/play/play-process.cpp +++ b/src/proc/play/play-process.cpp @@ -29,7 +29,6 @@ //#include //#include //#include -//#include diff --git a/src/proc/play/play-process.hpp b/src/proc/play/play-process.hpp index 9f7b88028..7fb265303 100644 --- a/src/proc/play/play-process.hpp +++ b/src/proc/play/play-process.hpp @@ -62,7 +62,6 @@ #include "lib/util.hpp" // #include -//#include #include //#include #include diff --git a/src/proc/play/play-service.cpp b/src/proc/play/play-service.cpp index b3824585d..d766b27bd 100644 --- a/src/proc/play/play-service.cpp +++ b/src/proc/play/play-service.cpp @@ -34,7 +34,6 @@ //#include ////#include #include -//#include diff --git a/src/proc/play/play-service.hpp b/src/proc/play/play-service.hpp index 491bee8fb..37756123b 100644 --- a/src/proc/play/play-service.hpp +++ b/src/proc/play/play-service.hpp @@ -60,7 +60,7 @@ #include "common/interface-facade-link.hpp" #include -#include +#include //#include @@ -72,7 +72,6 @@ namespace play { //using lumiera::Subsys; //using lumiera::Display; //using lumiera::DummyPlayer; - using boost::scoped_ptr; // class DummyImageGenerator; @@ -103,7 +102,7 @@ namespace play { , boost::noncopyable { InterfaceFacadeLink facadeAccess_; - scoped_ptr pTable_; + std::unique_ptr pTable_; /** Implementation: build a PlayProcess */ diff --git a/src/proc/play/render-configurator.cpp b/src/proc/play/render-configurator.cpp index e0be1facd..42fbfd807 100644 --- a/src/proc/play/render-configurator.cpp +++ b/src/proc/play/render-configurator.cpp @@ -31,7 +31,6 @@ //#include #include #include -//#include diff --git a/src/proc/play/render-configurator.hpp b/src/proc/play/render-configurator.hpp index c3c88910e..8c5f7159d 100644 --- a/src/proc/play/render-configurator.hpp +++ b/src/proc/play/render-configurator.hpp @@ -48,10 +48,9 @@ //#include "lib/util.hpp" // #include -//#include -//#include #include #include +//#include namespace proc { diff --git a/src/proc/play/timings.hpp b/src/proc/play/timings.hpp index 3c9389870..ff8a8a0c8 100644 --- a/src/proc/play/timings.hpp +++ b/src/proc/play/timings.hpp @@ -55,7 +55,6 @@ //#include #include #include -//#include namespace lib { namespace time{ diff --git a/tests/core/proc/engine/buff-table-test.cpp b/tests/core/proc/engine/buff-table-test.cpp index 859a027fe..49901ccbf 100644 --- a/tests/core/proc/engine/buff-table-test.cpp +++ b/tests/core/proc/engine/buff-table-test.cpp @@ -29,7 +29,7 @@ #include "lib/ref-array.hpp" #include "lib/format-cout.hpp" -#include +#include using test::Test; @@ -129,7 +129,7 @@ namespace test { */ class BuffTable_test : public Test { - typedef boost::scoped_ptr PSto; + using PSto = std::unique_ptr; PSto pStorage; ulong counter; diff --git a/tests/core/proc/engine/buffer-metadata-key-test.cpp b/tests/core/proc/engine/buffer-metadata-key-test.cpp index 93449ae07..1da4525b8 100644 --- a/tests/core/proc/engine/buffer-metadata-key-test.cpp +++ b/tests/core/proc/engine/buffer-metadata-key-test.cpp @@ -26,12 +26,10 @@ #include "lib/test/test-helper.hpp" #include "proc/engine/buffer-metadata.hpp" -#include #include #include #include -using boost::scoped_ptr; using util::isnil; using util::isSameObject; diff --git a/tests/core/proc/engine/buffer-metadata-test.cpp b/tests/core/proc/engine/buffer-metadata-test.cpp index dfa58fe65..e390e5955 100644 --- a/tests/core/proc/engine/buffer-metadata-test.cpp +++ b/tests/core/proc/engine/buffer-metadata-test.cpp @@ -28,12 +28,12 @@ #include "proc/engine/buffer-metadata.hpp" #include "proc/engine/testframe.hpp" -#include #include #include +#include using std::strncpy; -using boost::scoped_ptr; +using std::unique_ptr; using lib::test::randStr; using util::isSameObject; using util::isnil; @@ -82,7 +82,7 @@ namespace test { class BufferMetadata_test : public Test { /** common Metadata table to be tested */ - scoped_ptr meta_; + unique_ptr meta_; virtual void run (Arg) diff --git a/tests/core/proc/engine/calc-stream-test.cpp b/tests/core/proc/engine/calc-stream-test.cpp index 6993b02e8..4a7a94cbf 100644 --- a/tests/core/proc/engine/calc-stream-test.cpp +++ b/tests/core/proc/engine/calc-stream-test.cpp @@ -26,7 +26,6 @@ #include "proc/engine/engine-service.hpp" -//#include //#include using test::Test; diff --git a/tests/core/proc/engine/dispatcher-interface-test.cpp b/tests/core/proc/engine/dispatcher-interface-test.cpp index e75603f7d..0993e23d3 100644 --- a/tests/core/proc/engine/dispatcher-interface-test.cpp +++ b/tests/core/proc/engine/dispatcher-interface-test.cpp @@ -37,7 +37,6 @@ #include "lib/util-coll.hpp" #include "lib/util.hpp" -//#include #include #include diff --git a/tests/core/proc/engine/engine-interface-test.cpp b/tests/core/proc/engine/engine-interface-test.cpp index 025475bb6..ba2818977 100644 --- a/tests/core/proc/engine/engine-interface-test.cpp +++ b/tests/core/proc/engine/engine-interface-test.cpp @@ -33,7 +33,6 @@ #include "proc/asset/pipe.hpp" #include "lib/time/timevalue.hpp" -//#include //#include using test::Test; diff --git a/tests/core/proc/engine/testframe-test.cpp b/tests/core/proc/engine/testframe-test.cpp index ffd083ed8..d5da47da9 100644 --- a/tests/core/proc/engine/testframe-test.cpp +++ b/tests/core/proc/engine/testframe-test.cpp @@ -26,13 +26,12 @@ #include "lib/util.hpp" #include -#include -#include +#include using test::Test; using std::rand; using util::isSameObject; -using boost::scoped_ptr; +using std::unique_ptr; namespace proc { @@ -146,8 +145,8 @@ namespace test { void verifyFrameSeries() { - scoped_ptr thisFrames[CHAN_COUNT]; - scoped_ptr prevFrames[CHAN_COUNT]; + unique_ptr thisFrames[CHAN_COUNT]; + unique_ptr prevFrames[CHAN_COUNT]; for (uint i=0; i -#include -#include #include +#include #include @@ -132,7 +131,7 @@ namespace test { typedef TestFrameTable TestFrames; - boost::scoped_ptr testFrames; + std::unique_ptr testFrames; TestFrame& diff --git a/tests/core/proc/mobject/session/defs-registry-impl-test.cpp b/tests/core/proc/mobject/session/defs-registry-impl-test.cpp index 6bd74a51b..158bb46a1 100644 --- a/tests/core/proc/mobject/session/defs-registry-impl-test.cpp +++ b/tests/core/proc/mobject/session/defs-registry-impl-test.cpp @@ -31,14 +31,14 @@ #include "lib/query-diagnostics.hpp" -#include +#include #include using util::isnil; using util::_Fmt; using lib::P; -using boost::scoped_ptr; +using std::unique_ptr; using std::string; using std::rand; using std::map; @@ -102,7 +102,7 @@ namespace test { */ class DefsRegistryImpl_test : public Test { - scoped_ptr reg_; + unique_ptr reg_; typedef P> Obj; typedef P> Pra; diff --git a/tests/core/proc/mobject/session/session-service-access-test.cpp b/tests/core/proc/mobject/session/session-service-access-test.cpp index 941b83e8c..64c9eaf44 100644 --- a/tests/core/proc/mobject/session/session-service-access-test.cpp +++ b/tests/core/proc/mobject/session/session-service-access-test.cpp @@ -28,6 +28,7 @@ #include "lib/depend.hpp" #include +#include #include @@ -38,6 +39,7 @@ namespace test { using lib::Depend; using boost::lexical_cast; + using std::unique_ptr; using std::string; @@ -173,10 +175,10 @@ namespace test { struct TSessManagerImpl : TSessManager { - scoped_ptr pImpl_; + unique_ptr pImpl_; TSessManagerImpl() - : pImpl_(0) + : pImpl_{} { } SessionImplAPI* @@ -192,7 +194,7 @@ namespace test { void reset () { - scoped_ptr tmpS (new SessionImplAPI); + unique_ptr tmpS {new SessionImplAPI}; pImpl_.swap (tmpS); } }; diff --git a/tests/core/proc/play/diagnostic-output-slot.hpp b/tests/core/proc/play/diagnostic-output-slot.hpp index ecaf0a692..db76c995a 100644 --- a/tests/core/proc/play/diagnostic-output-slot.hpp +++ b/tests/core/proc/play/diagnostic-output-slot.hpp @@ -52,7 +52,6 @@ //#include #include #include -//#include namespace proc {