ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean-up: kill Boost scoped_ptr

Browse source 
std::unique_ptr is a drop-in replacement
This commit is contained in:
Fischlurch 2017-01-05 00:56:46 +01:00
parent 77303ad007
commit cd8844b409
68 changed files with 137 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/scons/Platform.py
View file

@ -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++'):

1
src/backend/real-clock.hpp
View file

@ -53,7 +53,6 @@
//#include <string>
//#include <vector>
//#include <memory>
//#include <boost/scoped_ptr.hpp>
//namespace lib {
//namespace time{

12
src/common/appstate.cpp
View file

@ -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<AppState> theApp_ (0);
static unique_ptr<AppState> theApp_;
if (!theApp_) theApp_.reset (new AppState ());
return *theApp_;
}

9
src/common/appstate.hpp
View file

@ -46,7 +46,7 @@
#include "common/basic-setup.hpp"
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <memory>
#include <string>
#include <map>
@ -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*);
~AppState ();
friend class std::default_delete<AppState>;
public:
@ -131,7 +130,7 @@ namespace lumiera {
private:
typedef scoped_ptr<SubsystemRunner> PSub;
using PSub = std::unique_ptr<SubsystemRunner>;
BasicSetup setup_;

6
src/common/guifacade.cpp
View file

@ -29,7 +29,7 @@
#include "lib/functor-util.hpp"
#include "common/instancehandle.hpp"
#include <boost/scoped_ptr.hpp>
#include <memory>
#include <functional>
#include <string>
@ -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<GuiRunner> facade (0);
unique_ptr<GuiRunner> facade;
class GuiSubsysDescriptor

6
src/common/query/defs-manager.hpp
View file

@ -28,8 +28,8 @@
#include "lib/p.hpp"
#include "common/query.hpp"
#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <memory>
@ -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<impl::DefsRegistry> defsRegistry_;
unique_ptr<impl::DefsRegistry> defsRegistry_;
public:

5
src/common/query/query-resolver.hpp
View file

@ -28,7 +28,6 @@
#include "common/query.hpp"
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <functional>
#include <memory>
#include <string>
@ -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<QueryDispatcher> dispatcher_;
unique_ptr<QueryDispatcher> dispatcher_;
public:

2
src/gui/panel/timeline-panel-obsolete.hpp
View file

@ -154,7 +154,7 @@ namespace model{
sigc::connection sequenceChooserChangedConnection;
// Body Widgets
boost::scoped_ptr<TimelineWidget> timelineWidget;
std::unique_ptr<TimelineWidget> timelineWidget;
std::map< weak_ptr<model::Sequence>
, shared_ptr<widget::timeline::TimelineState>

2
src/gui/widget/timeline/timeline-body.cpp
View file

@ -46,7 +46,7 @@ namespace timeline {
TimelineBody::TimelineBody (TimelineWidget &timelineWidget)
: Glib::ObjectBase("TimelineBody")
, tool(NULL)
, tool()
, mouseDownX(0)
, mouseDownY(0)
, dragType(None)

4
src/gui/widget/timeline/timeline-body.hpp
View file

@ -31,7 +31,7 @@
#include "gui/widget/timeline/timeline-tool.hpp"
#include "lib/time/timevalue.hpp"
#include <boost/scoped_ptr.hpp>
#include <memory>
namespace gui {
@ -188,7 +188,7 @@ private:
Shift
};
boost::scoped_ptr<timeline::Tool> tool;
std::unique_ptr<timeline::Tool> tool;
double mouseDownX, mouseDownY;
// Scroll State

4
src/gui/widget/timeline/timeline-track.hpp
View file

@ -36,7 +36,7 @@
#include "gui/widget/timeline/timeline-header-widget.hpp"
#include "lib/time/timevalue.hpp"
#include <boost/scoped_ptr.hpp>
#include <memory>
namespace gui {
@ -235,7 +235,7 @@ namespace timeline {
/**
* An internal timer used for the expand/collapse animation.
*/
boost::scoped_ptr<Glib::Timer> expand_timer;
std::unique_ptr<Glib::Timer> expand_timer;
//----- Header Widgets ------//

2
src/lib/allocation-cluster.hpp
View file

@ -52,7 +52,6 @@
#include "lib/scoped-holder.hpp"
#include "lib/scoped-holder-transfer.hpp"
#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <vector>
@ -60,7 +59,6 @@
namespace lib {
using boost::scoped_ptr;
/**
* A pile of objects sharing common allocation and lifecycle.

23
src/lib/lifecycleregistry.hpp
View file

@ -38,22 +38,23 @@
#ifndef LUMIERA_LIFECYCLEREGISTRY_H
#define LUMIERA_LIFECYCLEREGISTRY_H
#include <map>
#include <set>
#include <string>
#include <functional>
#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
#include "lib/util.hpp"
#include <boost/noncopyable.hpp>
#include <functional>
#include <memory>
#include <string>
#include <set>
#include <map>
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<LifecycleRegistry> theRegistry_;
static unique_ptr<LifecycleRegistry> 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*);
~LifecycleRegistry () { }
friend class std::default_delete<LifecycleRegistry>;
};

11
src/lib/scoped-holder.hpp
View file

@ -58,10 +58,9 @@
#ifndef LIB_SCOPED_HOLDER_H
#define LIB_SCOPED_HOLDER_H
#include <boost/scoped_ptr.hpp>
#include "lib/error.hpp"
#include <memory>
namespace lib {
@ -76,9 +75,9 @@ namespace lib {
*/
template<class B>
class ScopedPtrHolder
: public boost::scoped_ptr<B>
: public std::unique_ptr<B>
{
typedef boost::scoped_ptr<B> _Parent;
typedef std::unique_ptr<B> _Parent;
static B* must_be_null (_Parent const& ptr)
{
@ -89,8 +88,8 @@ namespace lib {
}
public:
ScopedPtrHolder ()
: _Parent(0)
ScopedPtrHolder()
: _Parent{}
{ }
template<class SU>

8
src/lib/test/depend-4test.hpp
View file

@ -30,9 +30,9 @@
#include "lib/depend.hpp"
#include "lib/meta/duck-detector.hpp"
#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <boost/utility/enable_if.hpp>
#include <memory>
namespace lib {
@ -100,12 +100,12 @@ namespace test{
{
typedef typename ServiceInterface<TYPE>::Type Interface;
boost::scoped_ptr<TYPE> mock_;
std::unique_ptr<TYPE> mock_;
Interface* shadowedOriginal_;
Depend4Test()
: mock_(new TYPE)
, shadowedOriginal_(Depend<Interface>::injectReplacement (mock_.get()))
: mock_{new TYPE}
, shadowedOriginal_{Depend<Interface>::injectReplacement (mock_.get())}
{ }
~Depend4Test()

6
src/proc/asset/struct.hpp
View file

@ -64,7 +64,7 @@
#include "common/query.hpp"
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <memory>
#include <string>
@ -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<StructFactoryImpl> impl_;
unique_ptr<StructFactoryImpl> impl_;
protected:
StructFactory ();

2
src/proc/control/stypemanager.cpp
View file

@ -36,7 +36,7 @@ namespace control {
STypeManager::STypeManager()
: reg_(0)
: reg_{}
{
reset();
}

4
src/proc/control/stypemanager.hpp
View file

@ -28,7 +28,7 @@
#include "proc/streamtype.hpp"
#include "lib/depend.hpp"
#include <boost/scoped_ptr.hpp>
#include <memory>
namespace proc {
@ -41,7 +41,7 @@ namespace control {
{
class Registry;
boost::scoped_ptr<Registry> reg_;
std::unique_ptr<Registry> reg_;
public:
static lib::Depend<STypeManager> instance;

6
src/proc/engine/buffer-provider.hpp
View file

@ -50,14 +50,14 @@
#include "proc/engine/buffer-local-key.hpp"
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <memory>
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<BufferMetadata> meta_;
unique_ptr<BufferMetadata> meta_;
protected: /* === for Implementation by concrete providers === */

1
src/proc/engine/calc-stream.hpp
View file

@ -36,7 +36,6 @@
//#include "lib/singleton-ref.hpp"
//
//#include <boost/noncopyable.hpp>
//#include <boost/scoped_ptr.hpp>
//#include <string>
#include <vector>

4
src/proc/engine/diagnostic-buffer-provider.hpp
View file

@ -36,8 +36,8 @@
#include "proc/engine/type-handler.hpp"
#include "proc/engine/buffer-provider.hpp"
#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <memory>
namespace proc {
@ -62,7 +62,7 @@ namespace engine {
: boost::noncopyable
{
boost::scoped_ptr<TrackingHeapBlockProvider> pImpl_;
std::unique_ptr<TrackingHeapBlockProvider> pImpl_;
static lib::Depend<DiagnosticBufferProvider> diagnostics;

1
src/proc/engine/engine-diagnostics.hpp
View file

@ -51,7 +51,6 @@
//#include "lib/depend.hpp"
//
#include <boost/noncopyable.hpp>
//#include <boost/scoped_ptr.hpp>
//#include <string>

1
src/proc/engine/engine-service-mock.cpp
View file

@ -27,7 +27,6 @@
//#include <string>
//#include <memory>
//#include <functional>
//#include <boost/scoped_ptr.hpp>

2
src/proc/engine/engine-service-mock.hpp
View file

@ -54,8 +54,6 @@
#include "lib/scoped-ptrvect.hpp"
//
#include <boost/noncopyable.hpp>
//#include <boost/scoped_ptr.hpp>
//#include <string>
namespace proc {

1
src/proc/engine/engine-service.cpp
View file

@ -27,7 +27,6 @@
//#include <string>
//#include <memory>
#include <functional>
//#include <boost/scoped_ptr.hpp>

1
src/proc/engine/engine-service.hpp
View file

@ -64,7 +64,6 @@
#include "lib/depend.hpp"
//
#include <boost/noncopyable.hpp>
//#include <boost/scoped_ptr.hpp>
#include <functional>
//#include <string>

2
src/proc/engine/nodewiring-def.hpp
View file

@ -45,8 +45,6 @@
#include "lib/util-foreach.hpp"
#include <boost/noncopyable.hpp>
//#include <boost/scoped_ptr.hpp>
//#include <cstddef>

4
src/proc/engine/nodewiring.hpp
View file

@ -30,7 +30,7 @@
#include "proc/engine/nodewiring-def.hpp"
//#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <memory>
//#include <cstddef>
@ -85,7 +85,7 @@ namespace engine {
class WiringFactory
{
lib::AllocationCluster& alloc_;
boost::scoped_ptr<config::WiringFactoryImpl> pImpl_;
std::unique_ptr<config::WiringFactoryImpl> pImpl_;
public:
WiringFactory (lib::AllocationCluster& a);

10
src/proc/engine/tracking-heap-block-provider.hpp
View file

@ -49,8 +49,7 @@
#include "lib/scoped-ptrvect.hpp"
#include <unordered_map>
#include <boost/scoped_ptr.hpp>
#include <boost/scoped_array.hpp>
#include <memory>
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<char> storage_;
unique_ptr<char[]> storage_;
bool was_released_;
@ -130,7 +128,7 @@ namespace engine {
class TrackingHeapBlockProvider
: public BufferProvider
{
scoped_ptr<diagn::PoolTable> pool_;
unique_ptr<diagn::PoolTable> pool_;
ScopedPtrVect<diagn::Block> outSeq_;
public:

4
src/proc/mobject/builder/operationpoint.hpp
View file

@ -28,7 +28,7 @@
//#include "common/query.hpp"
#include "lib/hash-standard.hpp"
#include <boost/scoped_ptr.hpp>
#include <memory>
#include <vector>
#include <string>
@ -56,7 +56,7 @@ namespace builder {
*/
class OperationPoint
{
boost::scoped_ptr<RefPoint> refPoint_;
std::unique_ptr<RefPoint> refPoint_;
public:
OperationPoint (engine::NodeFactory&, asset::Media const& srcMedia);

6
src/proc/mobject/builder/toolfactory.cpp
View file

@ -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<engine::RenderGraph> procSegment_;
scoped_ptr<SegmentationTool> segmentation_;
scoped_ptr<NodeCreatorTool> fabrication_;
unique_ptr<SegmentationTool> segmentation_;
unique_ptr<NodeCreatorTool> fabrication_;
BuildProcessState (session::Fixture& theTimeline)

3
src/proc/mobject/builder/toolfactory.hpp
View file

@ -30,7 +30,6 @@
#include "proc/mobject/builder/mould.hpp"
#include "proc/engine/rendergraph.hpp"
#include <boost/scoped_ptr.hpp>
#include <memory>
@ -50,7 +49,7 @@ namespace builder {
*/
class ToolFactory
{
boost::scoped_ptr<BuildProcessState> state_;
std::unique_ptr<BuildProcessState> state_;
public:
/** prepare a builder tool kit for dealing with the given Fixture,

7
src/proc/mobject/session/fixture.hpp
View file

@ -29,13 +29,14 @@
#include "proc/mobject/explicitplacement.hpp"
#include "proc/mobject/session/auto.hpp"
#include <list>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <memory>
#include <list>
using std::list;
using std::shared_ptr;
using std::unique_ptr;
@ -55,7 +56,7 @@ namespace session {
protected:
/////////////////////////////////////////////////TODO: placeholder code
list<ExplicitPlacement> content_;
boost::scoped_ptr<Segmentation> partitioning_;
unique_ptr<Segmentation> partitioning_;
/////////////////////////////////////////////////TICKET #573 who creates the fixture?

5
src/proc/mobject/session/locatingpin.cpp
View file

@ -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<LocatingPin>& chain)
cloneChain (const unique_ptr<LocatingPin>& chain)
{
if (!chain)
return 0;
@ -77,7 +78,7 @@ namespace session {
return next_->addChain (newLp);
else
{
scoped_ptr<LocatingPin> tmp_next (newLp);
unique_ptr<LocatingPin> tmp_next (newLp);
tmp_next->next_.swap(next_);
next_.swap(tmp_next);
return *newLp;

5
src/proc/mobject/session/locatingpin.hpp
View file

@ -52,8 +52,7 @@
#include <utility>
#include <memory>
#include <boost/scoped_ptr.hpp>
using boost::scoped_ptr;
@ -107,7 +106,7 @@ namespace mobject {
struct LocatingSolution;
/** next additional Pin, if any */
scoped_ptr<LocatingPin> next_;
std::unique_ptr<LocatingPin> next_;
/** order to consider when resolving. 0=highest */
virtual int getPrioLevel () const { return 0; }

6
src/proc/mobject/session/placement-index-query-resolver.cpp
View file

@ -29,7 +29,7 @@
#include "proc/mobject/test-dummy-mobject.hpp" /////////////////////////////////////TICKET #532
#include <boost/scoped_ptr.hpp>
#include <memory>
#include <stack>
@ -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<Explorer> explore_;
unique_ptr<Explorer> explore_;
virtual Result

8
src/proc/mobject/session/placement-index.hpp
View file

@ -113,9 +113,9 @@
#include "proc/mobject/placement.hpp"
#include "proc/mobject/placement-ref.hpp"
#include <unordered_map>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <unordered_map>
#include <memory>
#include <vector>
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<Table> pTab_;
unique_ptr<Table> pTab_;
typedef PlacementMO::ID _PID;

6
src/proc/mobject/session/scope-locator.hpp
View file

@ -30,15 +30,13 @@
#include "lib/iter-source.hpp" ////////////////////TICKET #493 : the bare interface would be sufficient here
#include "lib/depend.hpp"
#include <boost/scoped_ptr.hpp>
#include <memory>
namespace proc {
namespace mobject {
namespace session {
using boost::scoped_ptr;
class QueryFocusStack;
class ScopePath;
@ -60,7 +58,7 @@ namespace session {
*/
class ScopeLocator
{
scoped_ptr<QueryFocusStack> focusStack_;
std::unique_ptr<QueryFocusStack> focusStack_;
public:
static lib::Depend<ScopeLocator> instance;

8
src/proc/mobject/session/sess-manager-impl.cpp
View file

@ -48,7 +48,7 @@
#include "common/query/defs-manager.hpp"
#include "common/query.hpp"
using boost::scoped_ptr;
#include <memory>
@ -94,7 +94,7 @@ namespace session {
namespace { // defining details of the Session Lifecycle
typedef scoped_ptr<SessionImplAPI> SessionPImpl;
using SessionPImpl = std::unique_ptr<SessionImplAPI>;
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
}

4
src/proc/mobject/session/sess-manager-impl.hpp
View file

@ -46,8 +46,8 @@ namespace session {
: public SessManager
, public Sync<RecursiveLock_NoWait>
{
scoped_ptr<SessionImplAPI> pSess_;
scoped_ptr<LifecycleAdvisor> lifecycle_;
unique_ptr<SessionImplAPI> pSess_;
unique_ptr<LifecycleAdvisor> lifecycle_;
SessManagerImpl() throw();
friend class lib::DependencyFactory;

1
src/proc/play/dummy-play-connection.cpp
View file

@ -29,7 +29,6 @@
//#include <string>
//#include <memory>
//#include <functional>
//#include <boost/scoped_ptr.hpp>

1
src/proc/play/dummy-play-connection.hpp
View file

@ -96,7 +96,6 @@
#include "lib/iter-source.hpp"
//
#include <boost/noncopyable.hpp>
//#include <boost/scoped_ptr.hpp>
//#include <string>
#include <vector>

18
src/proc/play/dummy-player-service.cpp
View file

@ -30,10 +30,9 @@ extern "C" {
#include "common/interface-descriptor.h"
}
#include <string>
#include <memory>
#include <functional>
#include <boost/scoped_ptr.hpp>
#include <memory>
#include <string>
@ -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<DummyPlayerService> thePlayer_;
std::unique_ptr<DummyPlayerService> 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))}
{ }

8
src/proc/play/dummy-player-service.hpp
View file

@ -47,7 +47,7 @@
#include "lib/singleton-ref.hpp"
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <memory>
#include <string>
@ -84,9 +84,9 @@ namespace proc {
uint fps_;
bool play_;
Display::Sink display_;
boost::scoped_ptr<DummyImageGenerator> imageGen_;
boost::scoped_ptr<TickService> tick_;
Display::Sink display_;
std::unique_ptr<DummyImageGenerator> imageGen_;
std::unique_ptr<TickService> tick_;
public:

8
src/proc/play/output-director.cpp
View file

@ -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. "

9
src/proc/play/output-director.hpp
View file

@ -44,8 +44,7 @@
#include <boost/noncopyable.hpp>
//#include <string>
//#include <vector>
//#include <memory>
#include <boost/scoped_ptr.hpp>
#include <memory>
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<PlayService> player_;
unique_ptr<PlayService> 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<OutputDirector> instance;
bool connectUp() ;
void triggerDisconnect(SigTerm) throw();
void triggerDisconnect(SigTerm) noexcept;
bool isOperational() const;

2
src/proc/play/output-slot-connection.hpp
View file

@ -51,7 +51,6 @@
//#include "lib/sync.hpp"
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
//#include <string>
#include <functional>
#include <vector>
@ -72,7 +71,6 @@ namespace play {
//using std::bind;
using std::vector;
//using std::shared_ptr;
using boost::scoped_ptr;

6
src/proc/play/output-slot.hpp
View file

@ -74,7 +74,7 @@
#include "lib/iter-source.hpp"
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <memory>
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<ConnectionState> state_;
unique_ptr<ConnectionState> state_;
/** build the \em connected state,
* based on the existing configuration

1
src/proc/play/play-controller.cpp
View file

@ -42,7 +42,6 @@
//#include <string>
//#include <memory>
//#include <functional>
//#include <boost/scoped_ptr.hpp>
namespace lumiera {

1
src/proc/play/play-controller.hpp
View file

@ -38,7 +38,6 @@
//#include "lib/singleton-ref.hpp"
#include <boost/noncopyable.hpp>
//#include <boost/scoped_ptr.hpp>
//#include <string>

1
src/proc/play/play-process.cpp
View file

@ -29,7 +29,6 @@
//#include <string>
//#include <memory>
//#include <functional>
//#include <boost/scoped_ptr.hpp>

1
src/proc/play/play-process.hpp
View file

@ -62,7 +62,6 @@
#include "lib/util.hpp"
//
#include <boost/noncopyable.hpp>
//#include <boost/scoped_ptr.hpp>
#include <functional>
//#include <string>
#include <vector>

1
src/proc/play/play-service.cpp
View file

@ -34,7 +34,6 @@
//#include <memory>
////#include <functional>
#include <memory>
//#include <boost/scoped_ptr.hpp>

5
src/proc/play/play-service.hpp
View file

@ -60,7 +60,7 @@
#include "common/interface-facade-link.hpp"
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <memory>
//#include <string>
@ -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<lumiera::Play> facadeAccess_;
scoped_ptr<ProcessTable> pTable_;
std::unique_ptr<ProcessTable> pTable_;
/** Implementation: build a PlayProcess */

1
src/proc/play/render-configurator.cpp
View file

@ -31,7 +31,6 @@
//#include <memory>
#include <memory>
#include <functional>
//#include <boost/scoped_ptr.hpp>

3
src/proc/play/render-configurator.hpp
View file

@ -48,10 +48,9 @@
//#include "lib/util.hpp"
//
#include <boost/noncopyable.hpp>
//#include <boost/scoped_ptr.hpp>
//#include <string>
#include <functional>
#include <vector>
//#include <string>
namespace proc {

1
src/proc/play/timings.hpp
View file

@ -55,7 +55,6 @@
//#include <vector>
#include <boost/rational.hpp>
#include <memory>
//#include <boost/scoped_ptr.hpp>
namespace lib {
namespace time{

4
tests/core/proc/engine/buff-table-test.cpp
View file

@ -29,7 +29,7 @@
#include "lib/ref-array.hpp"
#include "lib/format-cout.hpp"
#include <boost/scoped_ptr.hpp>
#include <memory>
using test::Test;
@ -129,7 +129,7 @@ namespace test {
*/
class BuffTable_test : public Test
{
typedef boost::scoped_ptr<BuffTableStorage> PSto;
using PSto = std::unique_ptr<BuffTableStorage>;
PSto pStorage;
ulong counter;

2
tests/core/proc/engine/buffer-metadata-key-test.cpp
View file

@ -26,12 +26,10 @@
#include "lib/test/test-helper.hpp"
#include "proc/engine/buffer-metadata.hpp"
#include <boost/scoped_ptr.hpp>
#include <cstdlib>
#include <cstring>
#include <limits>
using boost::scoped_ptr;
using util::isnil;
using util::isSameObject;

6
tests/core/proc/engine/buffer-metadata-test.cpp
View file

@ -28,12 +28,12 @@
#include "proc/engine/buffer-metadata.hpp"
#include "proc/engine/testframe.hpp"
#include <boost/scoped_ptr.hpp>
#include <cstdlib>
#include <cstring>
#include <memory>
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<BufferMetadata> meta_;
unique_ptr<BufferMetadata> meta_;
virtual void
run (Arg)

1
tests/core/proc/engine/calc-stream-test.cpp
View file

@ -26,7 +26,6 @@
#include "proc/engine/engine-service.hpp"
//#include <boost/scoped_ptr.hpp>
//#include <ctime>
using test::Test;

1
tests/core/proc/engine/dispatcher-interface-test.cpp
View file

@ -37,7 +37,6 @@
#include "lib/util-coll.hpp"
#include "lib/util.hpp"
//#include <boost/scoped_ptr.hpp>
#include <functional>
#include <vector>

1
tests/core/proc/engine/engine-interface-test.cpp
View file

@ -33,7 +33,6 @@
#include "proc/asset/pipe.hpp"
#include "lib/time/timevalue.hpp"
//#include <boost/scoped_ptr.hpp>
//#include <ctime>
using test::Test;

9
tests/core/proc/engine/testframe-test.cpp
View file

@ -26,13 +26,12 @@
#include "lib/util.hpp"
#include <cstdlib>
#include <limits.h>
#include <boost/scoped_ptr.hpp>
#include <memory>
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<TestFrame> thisFrames[CHAN_COUNT];
scoped_ptr<TestFrame> prevFrames[CHAN_COUNT];
unique_ptr<TestFrame> thisFrames[CHAN_COUNT];
unique_ptr<TestFrame> prevFrames[CHAN_COUNT];
for (uint i=0; i<CHAN_COUNT; ++i)
thisFrames[i].reset (new TestFrame(0, i));

5
tests/core/proc/engine/testframe.cpp
View file

@ -25,10 +25,9 @@
#include "lib/error.hpp"
#include <boost/random/linear_congruential.hpp>
#include <boost/scoped_ptr.hpp>
#include <limits.h>
#include <cstring>
#include <memory>
#include <vector>
@ -132,7 +131,7 @@ namespace test {
typedef TestFrameTable<INITIAL_CHAN,INITIAL_FRAMES> TestFrames;
boost::scoped_ptr<TestFrames> testFrames;
std::unique_ptr<TestFrames> testFrames;
TestFrame&

6
tests/core/proc/mobject/session/defs-registry-impl-test.cpp
View file

@ -31,14 +31,14 @@
#include "lib/query-diagnostics.hpp"
#include <boost/scoped_ptr.hpp>
#include <memory>
#include <map>
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<DefsRegistry> reg_;
unique_ptr<DefsRegistry> reg_;
typedef P<Dummy<13>> Obj;
typedef P<Dummy<23>> Pra;

8
tests/core/proc/mobject/session/session-service-access-test.cpp
View file

@ -28,6 +28,7 @@
#include "lib/depend.hpp"
#include <boost/lexical_cast.hpp>
#include <memory>
#include <string>
@ -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<SessionImplAPI> pImpl_;
unique_ptr<SessionImplAPI> pImpl_;
TSessManagerImpl()
: pImpl_(0)
: pImpl_{}
{ }
SessionImplAPI*
@ -192,7 +194,7 @@ namespace test {
void
reset ()
{
scoped_ptr<SessionImplAPI> tmpS (new SessionImplAPI);
unique_ptr<SessionImplAPI> tmpS {new SessionImplAPI};
pImpl_.swap (tmpS);
}
};

1
tests/core/proc/play/diagnostic-output-slot.hpp
View file

@ -52,7 +52,6 @@
//#include <vector>
#include <unordered_set>
#include <memory>
//#include <boost/scoped_ptr.hpp>
namespace proc {