1
0
mirror of https://github.com/wfjm/w11.git synced 2026-04-13 16:47:41 +00:00

use std::shared_ptr instead of boost

This commit is contained in:
wfjm
2018-12-14 18:24:24 +01:00
parent cd97fb0f45
commit 70f0911b37
53 changed files with 219 additions and 182 deletions

View File

@@ -1,6 +1,6 @@
// $Id: ReventLoop.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: ReventLoop.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2.2 use std::shared_ptr instead of boost
// 2017-04-07 868 1.2.1 Dump(): add detail arg
// 2015-04-04 662 1.2 BUGFIX: fix race in Stop(), add UnStop,StopPending
// 2013-05-01 513 1.1.1 fTraceLevel now uint32_t
@@ -33,11 +34,11 @@
#include <cstdint>
#include <vector>
#include <memory>
#include "boost/utility.hpp"
#include "boost/function.hpp"
#include "boost/thread/mutex.hpp"
#include "boost/shared_ptr.hpp"
#include "librtools/RlogFile.hpp"
@@ -56,7 +57,7 @@ namespace Retro {
void RemovePollHandler(int fd, short events, bool nothrow=false);
void RemovePollHandler(int fd);
void SetLogFile(const boost::shared_ptr<RlogFile>& splog);
void SetLogFile(const std::shared_ptr<RlogFile>& splog);
void SetTraceLevel(uint32_t level);
uint32_t TraceLevel() const;
@@ -90,7 +91,7 @@ namespace Retro {
std::vector<pollfd> fPollFd;
std::vector<pollhdl_t> fPollHdl;
uint32_t fTraceLevel; //!< trace level
boost::shared_ptr<RlogFile> fspLog; //!< log file ptr
std::shared_ptr<RlogFile> fspLog; //!< log file ptr
};
} // end namespace Retro

View File

@@ -1,6 +1,6 @@
// $Id: ReventLoop.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: ReventLoop.ipp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2015 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2.1 use std::shared_ptr instead of boost
// 2015-04-04 662 1.2 BUGFIX: fix race in Stop(), add UnStop,StopPending
// 2013-05-01 513 1.1.1 fTraceLevel now uint32_t
// 2013-02-22 491 1.1 use new RlogFile/RlogMsg interfaces
@@ -56,7 +57,7 @@ inline bool ReventLoop::StopPending()
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline void ReventLoop::SetLogFile(const boost::shared_ptr<RlogFile>& splog)
inline void ReventLoop::SetLogFile(const std::shared_ptr<RlogFile>& splog)
{
fspLog = splog;
return;

View File

@@ -1,4 +1,4 @@
// $Id: RlinkChannel.cpp 1049 2018-09-22 13:56:52Z mueller $
// $Id: RlinkChannel.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.0.2 use std::shared_ptr instead of boost
// 2017-04-07 868 1.0.1 Dump(): add detail arg
// 2013-02-23 492 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -42,7 +43,7 @@ namespace Retro {
//------------------------------------------+-----------------------------------
//! Default constructor
RlinkChannel::RlinkChannel(const boost::shared_ptr<RlinkConnect>& spconn)
RlinkChannel::RlinkChannel(const std::shared_ptr<RlinkConnect>& spconn)
: fContext(),
fspConn(spconn)
{}

View File

@@ -1,6 +1,6 @@
// $Id: RlinkChannel.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RlinkChannel.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.0.2 use std::shared_ptr instead of boost
// 2017-04-07 868 1.0.1 Dump(): add detail arg
// 2013-02-23 492 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -26,7 +27,7 @@
#ifndef included_Retro_RlinkChannel
#define included_Retro_RlinkChannel 1
#include "boost/shared_ptr.hpp"
#include <memory>
#include "RlinkContext.hpp"
#include "RlinkConnect.hpp"
@@ -36,7 +37,7 @@ namespace Retro {
class RlinkChannel {
public:
explicit RlinkChannel(const boost::shared_ptr<RlinkConnect>& spconn);
explicit RlinkChannel(const std::shared_ptr<RlinkConnect>& spconn);
~RlinkChannel();
RlinkConnect& Connect();
@@ -49,7 +50,7 @@ namespace Retro {
protected:
RlinkContext fContext; //!< stat check and errcnt context
boost::shared_ptr<RlinkConnect> fspConn; //!< ptr to connect
std::shared_ptr<RlinkConnect> fspConn; //!< ptr to connect
};
} // end namespace Retro

View File

@@ -1,4 +1,4 @@
// $Id: RlinkConnect.hpp 1076 2018-12-02 12:45:49Z mueller $
// $Id: RlinkConnect.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 2.7.1 use std::shared_ptr instead of boost
// 2018-12-01 1076 2.7 use unique_ptr instead of scoped_ptr
// 2017-04-22 883 2.6.3 add rbus monitor probe, add HasRbmon()
// 2017-04-09 871 2.6.2 LogFileName(): returns now const std::string&
@@ -53,11 +54,11 @@
#include <cstdint>
#include <string>
#include <vector>
#include <memory>
#include <ostream>
#include "boost/utility.hpp"
#include "boost/thread/recursive_mutex.hpp"
#include "boost/shared_ptr.hpp"
#include "librtools/RerrMsg.hpp"
#include "librtools/Rtime.hpp"
@@ -152,7 +153,7 @@ namespace Retro {
void LogUseStream(std::ostream* pstr,
const std::string& name = "");
RlogFile& LogFile() const;
const boost::shared_ptr<RlogFile>& LogFileSPtr() const;
const std::shared_ptr<RlogFile>& LogFileSPtr() const;
void SetLogFileName(const std::string& name);
const std::string& LogFileName() const;
@@ -252,7 +253,7 @@ namespace Retro {
uint32_t fDumpLevel; //!< dump 0=off,1=err,2=chk,3=all
uint32_t fTraceLevel; //!< trace 0=off,1=buf,2=char
Rtime fTimeout; //!< response timeout
boost::shared_ptr<RlogFile> fspLog; //!< log file ptr
std::shared_ptr<RlogFile> fspLog; //!< log file ptr
boost::recursive_mutex fConnectMutex; //!< mutex to lock whole connect
uint16_t fAttnNotiPatt; //!< attn notifier pattern
Rtime fTsLastAttnNoti; //!< time stamp last attn notify

View File

@@ -1,4 +1,4 @@
// $Id: RlinkConnect.ipp 1076 2018-12-02 12:45:49Z mueller $
// $Id: RlinkConnect.ipp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 2.6.1 use std::shared_ptr instead of boost
// 2018-12-01 1076 2.6 use unique_ptr instead of scoped_ptr
// 2017-04-22 883 2.5.2 add rbus monitor probe, add HasRbmon()
// 2017-04-09 871 2.5.1 LogFileName(): returns now const std::string&
@@ -275,7 +276,7 @@ inline RlogFile& RlinkConnect::LogFile() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const boost::shared_ptr<RlogFile>& RlinkConnect::LogFileSPtr() const
inline const std::shared_ptr<RlogFile>& RlinkConnect::LogFileSPtr() const
{
return fspLog;
}

View File

@@ -1,4 +1,4 @@
// $Id: RlinkPort.hpp 1076 2018-12-02 12:45:49Z mueller $
// $Id: RlinkPort.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.4.3 use std::shared_ptr instead of boost
// 2018-12-01 1076 1.4 2 use unique_ptr
// 2017-04-07 868 1.4.1 Dump(): add detail arg
// 2017-02-19 853 1.4 use Rtime, drop TimeOfDayAsDouble
@@ -78,7 +79,7 @@ namespace Retro {
int FdRead() const;
int FdWrite() const;
void SetLogFile(const boost::shared_ptr<RlogFile>& splog);
void SetLogFile(const std::shared_ptr<RlogFile>& splog);
void SetTraceLevel(uint32_t level);
uint32_t TraceLevel() const;
@@ -113,7 +114,7 @@ namespace Retro {
bool fXon; //!< xon attribute set
int fFdRead; //!< fd for read
int fFdWrite; //!< fd for write
boost::shared_ptr<RlogFile> fspLog; //!< log file ptr
std::shared_ptr<RlogFile> fspLog; //!< log file ptr
uint32_t fTraceLevel; //!< trace level
Rtime fTsLastRead; //!< time stamp last write
Rtime fTsLastWrite; //!< time stamp last write

View File

@@ -1,6 +1,6 @@
// $Id: RlinkPort.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: RlinkPort.ipp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2011-2015 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.3.1 use std::shared_ptr instead of boost
// 2015-04-11 666 1.3 add fXon, XonEnable()
// 2013-05-01 513 1.2.1 fTraceLevel now uint32_t
// 2013-02-23 492 1.2 use RparseUrl
@@ -72,7 +73,7 @@ inline int RlinkPort::FdWrite() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline void RlinkPort::SetLogFile(const boost::shared_ptr<RlogFile>& splog)
inline void RlinkPort::SetLogFile(const std::shared_ptr<RlogFile>& splog)
{
fspLog = splog;
return;

View File

@@ -1,4 +1,4 @@
// $Id: RlinkServer.cpp 1075 2018-12-01 11:55:07Z mueller $
// $Id: RlinkServer.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 2.2.5 use std::shared_ptr instead of boost
// 2018-10-27 1059 2.2.4 coverity fixup (uncaught exception in dtor)
// 2017-04-07 868 2.2.3 Dump(): add detail arg
// 2015-06-05 686 2.2.2 BUGFIX: CallAttnHandler(): fix race in hnext
@@ -116,7 +117,7 @@ RlinkServer::~RlinkServer()
//------------------------------------------+-----------------------------------
//! FIXME_docs
void RlinkServer::SetConnect(const boost::shared_ptr<RlinkConnect>& spconn)
void RlinkServer::SetConnect(const std::shared_ptr<RlinkConnect>& spconn)
{
if (!fspConn && !spconn) return; // allow 0 = 0 ...
if (fspConn)

View File

@@ -1,6 +1,6 @@
// $Id: RlinkServer.hpp 1052 2018-09-30 08:10:52Z mueller $
// $Id: RlinkServer.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 2.2.2 use std::shared_ptr instead of boost
// 2017-04-07 868 2.2.1 Dump(): add detail arg
// 2015-01-10 632 2.2 Exec() without emsg now void, will throw
// 2014-12-30 625 2.1 adopt to Rlink V4 attn logic
@@ -36,10 +37,10 @@
#include <cstdint>
#include <vector>
#include <list>
#include <memory>
#include "boost/utility.hpp"
#include "boost/thread/thread.hpp"
#include "boost/shared_ptr.hpp"
#include "librtools/Rstats.hpp"
@@ -69,8 +70,8 @@ namespace Retro {
explicit RlinkServer();
virtual ~RlinkServer();
void SetConnect(const boost::shared_ptr<RlinkConnect>& spconn);
const boost::shared_ptr<RlinkConnect>& ConnectSPtr() const;
void SetConnect(const std::shared_ptr<RlinkConnect>& spconn);
const std::shared_ptr<RlinkConnect>& ConnectSPtr() const;
RlinkConnect& Connect() const;
RlogFile& LogFile() const;
RlinkContext& Context();
@@ -166,7 +167,7 @@ namespace Retro {
AttnDsc(attnhdl_t hdl, const AttnId& id);
};
boost::shared_ptr<RlinkConnect> fspConn;
std::shared_ptr<RlinkConnect> fspConn;
RlinkContext fContext; //!< default server context
std::vector<AttnDsc> fAttnDsc;
std::list<actnhdl_t> fActnList;

View File

@@ -1,6 +1,6 @@
// $Id: RlinkServer.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: RlinkServer.ipp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2015 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 2.2.1 use std::shared_ptr instead of boost
// 2015-01-10 632 2.2 Exec() without emsg now void, will throw
// 2014-12-30 625 2.1 adopt to Rlink V4 attn logic
// 2014-11-30 607 2.0 re-organize for rlink v4
@@ -32,7 +33,7 @@ namespace Retro {
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const boost::shared_ptr<RlinkConnect>& RlinkServer::ConnectSPtr() const
inline const std::shared_ptr<RlinkConnect>& RlinkServer::ConnectSPtr() const
{
return fspConn;
}

View File

@@ -1,4 +1,4 @@
// $Id: RtclRlinkPort.hpp 1076 2018-12-02 12:45:49Z mueller $
// $Id: RtclRlinkPort.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2.1 use std::shared_ptr instead of boost
// 2018-12-01 1076 1.2 use unique_ptr
// 2017-04-29 888 1.1 LogFileName(): returns now const std::string&
// drop M_rawio; add M_rawread,M_rawrblk,M_rawwblk
@@ -31,6 +32,7 @@
#include <cstddef>
#include <string>
#include <memory>
#include "librtools/RlogFile.hpp"
#include "librtcltools/RtclProxyBase.hpp"
@@ -73,7 +75,7 @@ namespace Retro {
protected:
RlinkPort::port_uptr_t fupObj; //!< uptr to managed port
boost::shared_ptr<RlogFile> fspLog; //!< port log file
std::shared_ptr<RlogFile> fspLog; //!< port log file
uint32_t fTraceLevel; //!< 0=off,1=buf,2=char
size_t fErrCnt; //!< error count
RtclGetList fGets;

View File

@@ -1,4 +1,4 @@
// $Id: RtclRlinkServer.hpp 1076 2018-12-02 12:45:49Z mueller $
// $Id: RtclRlinkServer.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2.1 use std::shared_ptr instead of boost
// 2018-12-01 1076 1.2 use unique_ptr
// 2015-04-04 662 1.1 add M_get, M_set; remove 'server -trace'
// 2013-02-05 482 1.0.1 add shared_ptr to RlinkConnect object
@@ -29,8 +30,7 @@
#include <cstddef>
#include <list>
#include "boost/shared_ptr.hpp"
#include <memory>
#include "librtcltools/RtclOPtr.hpp"
#include "librtcltools/RtclProxyOwned.hpp"
@@ -65,7 +65,7 @@ namespace Retro {
typedef std::unique_ptr<RtclAttnShuttle> ahdl_uptr_t;
typedef std::list<ahdl_uptr_t> alist_t;
boost::shared_ptr<RlinkConnect> fspConn;
std::shared_ptr<RlinkConnect> fspConn;
alist_t fAttnHdl; //!< list of attn handlers
RtclGetList fGets;
RtclSetList fSets;

View File

@@ -1,6 +1,6 @@
// $Id: RtclProxyOwned.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclProxyOwned.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2011-2013 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.1.1 use std::shared_ptr instead of boost
// 2013-02-05 482 1.1 use shared_ptr to TO*; add ObjPtr();
// 2011-02-13 361 1.0 Initial version
// 2011-02-11 360 0.1 First draft
@@ -26,7 +27,7 @@
#ifndef included_Retro_RtclProxyOwned
#define included_Retro_RtclProxyOwned 1
#include "boost/shared_ptr.hpp"
#include <memory>
#include "RtclProxyBase.hpp"
@@ -42,10 +43,10 @@ namespace Retro {
~RtclProxyOwned();
TO& Obj();
const boost::shared_ptr<TO>& ObjSPtr();
const std::shared_ptr<TO>& ObjSPtr();
protected:
boost::shared_ptr<TO> fspObj; //!< sptr to managed object
std::shared_ptr<TO> fspObj; //!< sptr to managed object
};

View File

@@ -1,6 +1,6 @@
// $Id: RtclProxyOwned.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclProxyOwned.ipp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2011-2013 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.1.1 use std::shared_ptr instead of boost
// 2013-02-05 482 1.1 use shared_ptr to TO*; add ObjPtr();
// 2011-02-13 361 1.0 Initial version
// 2011-02-11 360 0.1 First draft
@@ -82,7 +83,7 @@ inline TO& RtclProxyOwned<TO>::Obj()
//! FIXME_docs
template <class TO>
inline const boost::shared_ptr<TO>& RtclProxyOwned<TO>::ObjSPtr()
inline const std::shared_ptr<TO>& RtclProxyOwned<TO>::ObjSPtr()
{
return fspObj;
}

View File

@@ -1,4 +1,4 @@
// $Id: RlogFileCatalog.cpp 1066 2018-11-10 11:21:53Z mueller $
// $Id: RlogFileCatalog.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.0.2 use std::shared_ptr instead of boost
// 2018-11-09 1066 1.0.1 use auto; use make_pair,emplace
// 2013-02-22 491 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -48,13 +49,13 @@ RlogFileCatalog& RlogFileCatalog::Obj()
//------------------------------------------+-----------------------------------
//! FIXME_docs
const boost::shared_ptr<RlogFile>&
const std::shared_ptr<RlogFile>&
RlogFileCatalog::FindOrCreate(const std::string& name)
{
auto it = fMap.find(name);
if (it != fMap.end()) return it->second;
boost::shared_ptr<RlogFile> sptr(new RlogFile());
std::shared_ptr<RlogFile> sptr(new RlogFile());
auto pitb = fMap.emplace(make_pair(name, sptr));
return pitb.first->second;

View File

@@ -1,6 +1,6 @@
// $Id: RlogFileCatalog.hpp 1066 2018-11-10 11:21:53Z mueller $
// $Id: RlogFileCatalog.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2011-2013 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.0.1 use std::shared_ptr instead of boost
// 2013-02-22 491 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -25,9 +26,9 @@
#define included_Retro_RlogFileCatalog 1
#include <map>
#include <memory>
#include "boost/utility.hpp"
#include "boost/shared_ptr.hpp"
#include "RlogFile.hpp"
@@ -38,7 +39,7 @@ namespace Retro {
static RlogFileCatalog& Obj();
const boost::shared_ptr<RlogFile>& FindOrCreate(const std::string& name);
const std::shared_ptr<RlogFile>& FindOrCreate(const std::string& name);
void Delete(const std::string& name);
private:
@@ -46,7 +47,7 @@ namespace Retro {
~RlogFileCatalog();
protected:
typedef std::map<std::string, boost::shared_ptr<RlogFile>> map_t;
typedef std::map<std::string, std::shared_ptr<RlogFile>> map_t;
map_t fMap; //!< name->rlogfile map
};

View File

@@ -1,4 +1,4 @@
// $Id: Rw11.cpp 1049 2018-09-22 13:56:52Z mueller $
// $Id: Rw11.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.1.2 use std::shared_ptr instead of boost
// 2017-04-07 868 1.1.1 Dump(): add detail arg
// 2014-12-30 625 1.1 adopt to Rlink V4 attn logic
// 2013-03-06 495 1.0 Initial version
@@ -64,7 +65,7 @@ Rw11::~Rw11()
//------------------------------------------+-----------------------------------
//! FIXME_docs
void Rw11::SetServer(const boost::shared_ptr<RlinkServer>& spserv)
void Rw11::SetServer(const std::shared_ptr<RlinkServer>& spserv)
{
fspServ = spserv;
fspServ->AddAttnHandler(boost::bind(&Rw11::AttnHandler, this, _1),
@@ -75,7 +76,7 @@ void Rw11::SetServer(const boost::shared_ptr<RlinkServer>& spserv)
//------------------------------------------+-----------------------------------
//! FIXME_docs
void Rw11::AddCpu(const boost::shared_ptr<Rw11Cpu>& spcpu)
void Rw11::AddCpu(const std::shared_ptr<Rw11Cpu>& spcpu)
{
if (fNCpu >= 4)
throw Rexception("Rw11::AddCpu", "Bad state: already 4 cpus registered");

View File

@@ -1,6 +1,6 @@
// $Id: Rw11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.1.2 use std::shared_ptr instead of boost
// 2017-04-07 868 1.1.1 Dump(): add detail arg
// 2014-12-29 624 1.1 adopt to Rlink V4 attn logic
// 2013-03-06 495 1.0 Initial version
@@ -28,8 +29,9 @@
#ifndef included_Retro_Rw11
#define included_Retro_Rw11 1
#include <memory>
#include "boost/utility.hpp"
#include "boost/shared_ptr.hpp"
#include "librlink/RlinkServer.hpp"
@@ -43,13 +45,13 @@ namespace Retro {
Rw11();
virtual ~Rw11();
void SetServer(const boost::shared_ptr<RlinkServer>& spserv);
const boost::shared_ptr<RlinkServer>& ServerSPtr() const;
void SetServer(const std::shared_ptr<RlinkServer>& spserv);
const std::shared_ptr<RlinkServer>& ServerSPtr() const;
RlinkServer& Server() const;
RlinkConnect& Connect() const;
RlogFile& LogFile() const;
void AddCpu(const boost::shared_ptr<Rw11Cpu>& spcpu);
void AddCpu(const std::shared_ptr<Rw11Cpu>& spcpu);
size_t NCpu() const;
Rw11Cpu& Cpu(size_t ind) const;
@@ -66,9 +68,9 @@ namespace Retro {
int AttnHandler(RlinkServer::AttnArgs& args);
protected:
boost::shared_ptr<RlinkServer> fspServ;
std::shared_ptr<RlinkServer> fspServ;
size_t fNCpu;
boost::shared_ptr<Rw11Cpu> fspCpu[4];
std::shared_ptr<Rw11Cpu> fspCpu[4];
bool fStarted; //!< true if Start() called
};

View File

@@ -1,6 +1,6 @@
// $Id: Rw11.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11.ipp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.0.1 use std::shared_ptr instead of boost
// 2013-03-06 495 1.0 Initial version
// 2013-01-27 478 0.1 First draft
// ---------------------------------------------------------------------------
@@ -28,7 +29,7 @@ namespace Retro {
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const boost::shared_ptr<RlinkServer>& Rw11::ServerSPtr() const
inline const std::shared_ptr<RlinkServer>& Rw11::ServerSPtr() const
{
return fspServ;
}

View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlBase.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlBase.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.0.3 use std::shared_ptr instead of boost
// 2017-04-15 874 1.0.2 add UnitBase()
// 2017-04-02 865 1.0.1 Dump(): add detail arg
// 2013-03-06 495 1.0 Initial version
@@ -28,7 +29,7 @@
#ifndef included_Retro_Rw11CntlBase
#define included_Retro_Rw11CntlBase 1
#include "boost/shared_ptr.hpp"
#include <memory>
#include "Rw11Cntl.hpp"
@@ -44,13 +45,13 @@ namespace Retro {
virtual size_t NUnit() const;
virtual Rw11Unit& UnitBase(size_t index) const;
TU& Unit(size_t index) const;
const boost::shared_ptr<TU>& UnitSPtr(size_t index) const;
const std::shared_ptr<TU>& UnitSPtr(size_t index) const;
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;
protected:
boost::shared_ptr<TU> fspUnit[NU];
std::shared_ptr<TU> fspUnit[NU];
};
} // end namespace Retro

View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlBase.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlBase.ipp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.0.3 use std::shared_ptr instead of boost
// 2017-04-15 874 1.0.2 add UnitBase()
// 2017-04-02 865 1.0.1 Dump(): add detail arg
// 2013-03-06 495 1.0 Initial version
@@ -83,7 +84,7 @@ inline TU& Rw11CntlBase<TU,NU>::Unit(size_t index) const
//! FIXME_docs
template <class TU, size_t NU>
inline const boost::shared_ptr<TU>&
inline const std::shared_ptr<TU>&
Rw11CntlBase<TU,NU>::UnitSPtr(size_t index) const
{
return fspUnit[index];

View File

@@ -1,4 +1,4 @@
// $Id: Rw11Cpu.cpp 1070 2018-11-17 09:48:04Z mueller $
// $Id: Rw11Cpu.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2.16 use std::shared_ptr instead of boost
// 2018-11-16 1070 1.2.15 use auto; use emplace,make_pair; use range loop
// 2018-09-23 1050 1.2.14 add HasPcnt()
// 2018-09-22 1048 1.2.13 coverity fixup (drop unreachable code)
@@ -224,7 +225,7 @@ void Rw11Cpu::Setup(Rw11* pw11)
//------------------------------------------+-----------------------------------
//! FIXME_docs
void Rw11Cpu::AddCntl(const boost::shared_ptr<Rw11Cntl>& spcntl)
void Rw11Cpu::AddCntl(const std::shared_ptr<Rw11Cntl>& spcntl)
{
if (!spcntl)
throw Rexception("Rw11Cpu::AddCntl","Bad args: spcntl == 0");

View File

@@ -1,4 +1,4 @@
// $Id: Rw11Cpu.hpp 1066 2018-11-10 11:21:53Z mueller $
// $Id: Rw11Cpu.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,7 +13,8 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-09-23 1050 1.2.11 add HasPcnt()
// 2018-12-07 1078 1.2.12 use std::shared_ptr instead of boost
// 2018-09-23 1050 1.2.11 add HasPcnt()
// 2017-04-07 868 1.2.10 Dump(): add detail arg
// 2017-02-26 857 1.2.9 add kCPAH_M_UBM22
// 2017-02-19 853 1.2.8 use Rtime
@@ -43,10 +44,10 @@
#include <string>
#include <vector>
#include <memory>
#include <map>
#include "boost/utility.hpp"
#include "boost/shared_ptr.hpp"
#include "boost/thread/locks.hpp"
#include "boost/thread/condition_variable.hpp"
@@ -66,7 +67,7 @@ namespace Retro {
class Rw11Cpu : public Rbits, private boost::noncopyable {
public:
typedef std::map<std::string, boost::shared_ptr<Rw11Cntl>> cmap_t;
typedef std::map<std::string, std::shared_ptr<Rw11Cntl>> cmap_t;
explicit Rw11Cpu(const std::string& type);
virtual ~Rw11Cpu();
@@ -91,7 +92,7 @@ namespace Retro {
bool HasKw11p() const;
bool HasIist() const;
void AddCntl(const boost::shared_ptr<Rw11Cntl>& spcntl);
void AddCntl(const std::shared_ptr<Rw11Cntl>& spcntl);
bool TestCntl(const std::string& name) const;
void ListCntl(std::vector<std::string>& list) const;
Rw11Cntl& Cntl(const std::string& name) const;

View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -30,8 +30,7 @@
#include <cstddef>
#include <string>
#include "boost/shared_ptr.hpp"
#include <memory>
#include "librtcltools/RtclProxyOwned.hpp"
#include "librtcltools/RtclGetList.hpp"
@@ -59,7 +58,7 @@ namespace Retro {
Tcl_Obj* CpuCommands();
protected:
boost::shared_ptr<RlinkServer> fspServ;
std::shared_ptr<RlinkServer> fspServ;
RtclGetList fGets;
RtclSetList fSets;
};

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11CntlBase.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlBase.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-16 877 1.1 add class in ctor
// 2013-03-06 495 1.0 Initial version
// 2013-02-08 484 0.1 First draft
@@ -27,7 +28,7 @@
#ifndef included_Retro_RtclRw11CntlBase
#define included_Retro_RtclRw11CntlBase 1
#include "boost/shared_ptr.hpp"
#include <memory>
#include "RtclRw11Cntl.hpp"
@@ -41,13 +42,13 @@ namespace Retro {
~RtclRw11CntlBase();
virtual TC& Obj();
const boost::shared_ptr<TC>& ObjSPtr();
const std::shared_ptr<TC>& ObjSPtr();
protected:
int M_bootcode(RtclArgs& args);
protected:
boost::shared_ptr<TC> fspObj; //!< sptr to managed object
std::shared_ptr<TC> fspObj; //!< sptr to managed object
};
} // end namespace Retro

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11CntlBase.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlBase.ipp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2.1 use std::shared_ptr instead of boost
// 2017-04-16 877 1.2 add class in ctor
// 2017-02-04 848 1.1 add in fGets: found,pdataint,pdatarem
// 2013-03-06 495 1.0 Initial version
@@ -82,7 +83,7 @@ inline TC& RtclRw11CntlBase<TC>::Obj()
//! FIXME_docs
template <class TC>
inline const boost::shared_ptr<TC>& RtclRw11CntlBase<TC>::ObjSPtr()
inline const std::shared_ptr<TC>& RtclRw11CntlBase<TC>::ObjSPtr()
{
return fspObj;
}

View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11CntlDiskBase.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlDiskBase.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2017- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -25,8 +25,6 @@
#ifndef included_Retro_RtclRw11CntlDiskBase
#define included_Retro_RtclRw11CntlDiskBase 1
#include "boost/shared_ptr.hpp"
#include "RtclRw11CntlRdmaBase.hpp"
namespace Retro {

View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11CntlRdmaBase.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlRdmaBase.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2017- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -25,8 +25,6 @@
#ifndef included_Retro_RtclRw11CntlRdmaBase
#define included_Retro_RtclRw11CntlRdmaBase 1
#include "boost/shared_ptr.hpp"
#include "RtclRw11CntlBase.hpp"
namespace Retro {

View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11CntlStreamBase.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlStreamBase.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2017- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -25,8 +25,6 @@
#ifndef included_Retro_RtclRw11CntlStreamBase
#define included_Retro_RtclRw11CntlStreamBase 1
#include "boost/shared_ptr.hpp"
#include "RtclRw11CntlBase.hpp"
namespace Retro {

View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11CntlTapeBase.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlTapeBase.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2017- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -25,8 +25,6 @@
#ifndef included_Retro_RtclRw11CntlTapeBase
#define included_Retro_RtclRw11CntlTapeBase 1
#include "boost/shared_ptr.hpp"
#include "RtclRw11CntlRdmaBase.hpp"
namespace Retro {

View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11CntlTermBase.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlTermBase.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2017- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -25,8 +25,6 @@
#ifndef included_Retro_RtclRw11CntlTermBase
#define included_Retro_RtclRw11CntlTermBase 1
#include "boost/shared_ptr.hpp"
#include "RtclRw11CntlBase.hpp"
namespace Retro {

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11CpuBase.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CpuBase.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.1 use std::shared_ptr instead of boost
// 2013-02-23 491 1.0 Initial version
// 2013-02-08 484 0.1 First draft
// ---------------------------------------------------------------------------
@@ -26,7 +27,7 @@
#ifndef included_Retro_RtclRw11CpuBase
#define included_Retro_RtclRw11CpuBase 1
#include "boost/shared_ptr.hpp"
#include <memory>
#include "RtclRw11Cpu.hpp"
@@ -40,10 +41,10 @@ namespace Retro {
~RtclRw11CpuBase();
TO& Obj();
const boost::shared_ptr<TO>& ObjSPtr();
const std::shared_ptr<TO>& ObjSPtr();
protected:
boost::shared_ptr<TO> fspObj; //!< sptr to managed object
std::shared_ptr<TO> fspObj; //!< sptr to managed object
};
} // end namespace Retro

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11CpuBase.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CpuBase.ipp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.0.1 use std::shared_ptr instead of boost
// 2013-02-23 491 1.0 Initial version
// 2013-02-08 484 0.1 First draft
// ---------------------------------------------------------------------------
@@ -63,7 +64,7 @@ inline TO& RtclRw11CpuBase<TO>::Obj()
//! FIXME_docs
template <class TO>
inline const boost::shared_ptr<TO>& RtclRw11CpuBase<TO>::ObjSPtr()
inline const std::shared_ptr<TO>& RtclRw11CpuBase<TO>::ObjSPtr()
{
return fspObj;
}

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitBase.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitBase.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.3 use std::shared_ptr instead of boost
// 2017-04-08 870 1.2 add TUV,TB; add TUV* ObjUV(); inherit from TB
// 2017-04-02 863 1.1 add AttachDone()
// 2013-03-06 495 1.0 Initial version
@@ -28,7 +29,7 @@
#ifndef included_Retro_RtclRw11UnitBase
#define included_Retro_RtclRw11UnitBase 1
#include "boost/shared_ptr.hpp"
#include <memory>
#include "RtclRw11Unit.hpp"
@@ -38,20 +39,20 @@ namespace Retro {
class RtclRw11UnitBase : public TB {
public:
RtclRw11UnitBase(const std::string& type,
const boost::shared_ptr<TU>& spunit);
const std::shared_ptr<TU>& spunit);
~RtclRw11UnitBase();
virtual TU& Obj();
virtual TUV& ObjUV();
virtual Rw11Cpu& Cpu() const;
const boost::shared_ptr<TU>& ObjSPtr();
const std::shared_ptr<TU>& ObjSPtr();
protected:
virtual void AttachDone();
int M_stats(RtclArgs& args);
protected:
boost::shared_ptr<TU> fspObj; //!< sptr to managed object
std::shared_ptr<TU> fspObj; //!< sptr to managed object
};
} // end namespace Retro

View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11UnitBase.ipp 1076 2018-12-02 12:45:49Z mueller $
// $Id: RtclRw11UnitBase.ipp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.3.3 use std::shared_ptr instead of boost
// 2018-12-01 1076 1.3.2 use unique_ptr
// 2017-04-15 875 1.3.1 add attached,attachutl getters
// 2017-04-08 870 1.3 add TUV,TB; add TUV* ObjUV(); inherit from TB
@@ -55,7 +56,7 @@ namespace Retro {
template <class TU, class TUV, class TB>
inline RtclRw11UnitBase<TU,TUV,TB>::RtclRw11UnitBase(const std::string& type,
const boost::shared_ptr<TU>& spunit)
const std::shared_ptr<TU>& spunit)
: TB(type),
fspObj(spunit)
{
@@ -115,7 +116,7 @@ inline Rw11Cpu& RtclRw11UnitBase<TU,TUV,TB>::Cpu() const
//! FIXME_docs
template <class TU, class TUV, class TB>
inline const boost::shared_ptr<TU>& RtclRw11UnitBase<TU,TUV,TB>::ObjSPtr()
inline const std::shared_ptr<TU>& RtclRw11UnitBase<TU,TUV,TB>::ObjSPtr()
{
return fspObj;
}

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitDEUNA.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitDEUNA.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2014-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2014-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.1 use std::shared_ptr instead of boost
// 2017-04-08 870 1.0 Initial version
// 2014-06-09 561 0.1 First draft
// ---------------------------------------------------------------------------
@@ -39,7 +40,7 @@ namespace Retro {
RtclRw11UnitDEUNA::RtclRw11UnitDEUNA(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitDEUNA>& spunit)
const std::shared_ptr<Rw11UnitDEUNA>& spunit)
: RtclRw11UnitBase<Rw11UnitDEUNA,Rw11Unit,
RtclRw11Unit>("Rw11UnitDEUNA", spunit)
{

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitDEUNA.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitDEUNA.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2014-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2014-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.1 use std::shared_ptr instead of boost
// 2017-04-08 870 1.0 Initial version
// 2014-06-09 561 0.1 First draft
// ---------------------------------------------------------------------------
@@ -38,7 +39,7 @@ class RtclRw11UnitDEUNA : public RtclRw11UnitBase<Rw11UnitDEUNA,Rw11Unit,
public:
RtclRw11UnitDEUNA(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitDEUNA>& spunit);
const std::shared_ptr<Rw11UnitDEUNA>& spunit);
~RtclRw11UnitDEUNA();
protected:

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitDL11.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitDL11.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2013-03-01 493 1.0 Initial version
// 2013-02-16 488 0.1 First draft
@@ -40,7 +41,7 @@ namespace Retro {
RtclRw11UnitDL11::RtclRw11UnitDL11(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitDL11>& spunit)
const std::shared_ptr<Rw11UnitDL11>& spunit)
: RtclRw11UnitBase<Rw11UnitDL11,Rw11UnitTerm,
RtclRw11UnitTerm>("Rw11UnitDL11", spunit)
{

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitDL11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitDL11.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2013-03-01 493 1.0 Initial version
// 2013-02-16 488 0.1 First draft
@@ -40,7 +41,7 @@ namespace Retro {
public:
RtclRw11UnitDL11(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitDL11>& spunit);
const std::shared_ptr<Rw11UnitDL11>& spunit);
~RtclRw11UnitDL11();
protected:

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitLP11.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitLP11.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2013-05-01 513 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -39,7 +40,7 @@ namespace Retro {
RtclRw11UnitLP11::RtclRw11UnitLP11(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitLP11>& spunit)
const std::shared_ptr<Rw11UnitLP11>& spunit)
: RtclRw11UnitBase<Rw11UnitLP11,Rw11UnitStream,
RtclRw11UnitStream>("Rw11UnitLP11", spunit)
{

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitLP11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitLP11.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2013-05-01 513 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -39,7 +40,7 @@ class RtclRw11UnitLP11 : public RtclRw11UnitBase<Rw11UnitLP11,Rw11UnitStream,
public:
RtclRw11UnitLP11(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitLP11>& spunit);
const std::shared_ptr<Rw11UnitLP11>& spunit);
~RtclRw11UnitLP11();
protected:

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitPC11.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitPC11.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2014-08-22 584 1.0.1 use nullptr
// 2013-05-03 515 1.0 Initial version
@@ -40,7 +41,7 @@ namespace Retro {
RtclRw11UnitPC11::RtclRw11UnitPC11(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitPC11>& spunit)
const std::shared_ptr<Rw11UnitPC11>& spunit)
: RtclRw11UnitBase<Rw11UnitPC11,Rw11UnitStream,
RtclRw11UnitStream>("Rw11UnitPC11", spunit)
{

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitPC11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitPC11.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2013-05-03 515 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -39,7 +40,7 @@ class RtclRw11UnitPC11 : public RtclRw11UnitBase<Rw11UnitPC11,Rw11UnitStream,
public:
RtclRw11UnitPC11(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitPC11>& spunit);
const std::shared_ptr<Rw11UnitPC11>& spunit);
~RtclRw11UnitPC11();
protected:

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitRHRP.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitRHRP.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2015-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2015-05-14 680 1.0 Initial version
// 2015-03-21 659 0.1 First draft
@@ -40,7 +41,7 @@ namespace Retro {
RtclRw11UnitRHRP::RtclRw11UnitRHRP(
Tcl_Interp* interp, const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitRHRP>& spunit)
const std::shared_ptr<Rw11UnitRHRP>& spunit)
: RtclRw11UnitBase<Rw11UnitRHRP,Rw11UnitDisk,
RtclRw11UnitDisk>("Rw11UnitRHRP", spunit)
{

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitRHRP.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitRHRP.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2015-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2015-05-14 680 1.0 Initial version
// 2015-03-21 659 0.1 First draft
@@ -40,7 +41,7 @@ namespace Retro {
public:
RtclRw11UnitRHRP(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitRHRP>& spunit);
const std::shared_ptr<Rw11UnitRHRP>& spunit);
~RtclRw11UnitRHRP();
protected:

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitRK11.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitRK11.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2013-02-22 490 1.0 Initial version
// 2013-02-16 488 0.1 First draft
@@ -40,7 +41,7 @@ namespace Retro {
RtclRw11UnitRK11::RtclRw11UnitRK11(
Tcl_Interp* interp, const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitRK11>& spunit)
const std::shared_ptr<Rw11UnitRK11>& spunit)
: RtclRw11UnitBase<Rw11UnitRK11,Rw11UnitDisk,
RtclRw11UnitDisk>("Rw11UnitRK11", spunit)
{

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitRK11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitRK11.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2013- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.1 use std::shared_ptr instead of boost
// 2013-02-22 490 1.0 Initial version
// 2013-02-16 488 0.1 First draft
// ---------------------------------------------------------------------------
@@ -39,7 +40,7 @@ namespace Retro {
public:
RtclRw11UnitRK11(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitRK11>& spunit);
const std::shared_ptr<Rw11UnitRK11>& spunit);
~RtclRw11UnitRK11();
protected:

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitRL11.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitRL11.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2014-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2014-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2014-06-08 561 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -39,7 +40,7 @@ namespace Retro {
RtclRw11UnitRL11::RtclRw11UnitRL11(
Tcl_Interp* interp, const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitRL11>& spunit)
const std::shared_ptr<Rw11UnitRL11>& spunit)
: RtclRw11UnitBase<Rw11UnitRL11,Rw11UnitDisk,
RtclRw11UnitDisk>("Rw11UnitRL11", spunit)
{

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitRL11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitRL11.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2014- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2014-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.1 use std::shared_ptr instead of boost
// 2014-06-08 561 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -38,7 +39,7 @@ namespace Retro {
public:
RtclRw11UnitRL11(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitRL11>& spunit);
const std::shared_ptr<Rw11UnitRL11>& spunit);
~RtclRw11UnitRL11();
protected:

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitTM11.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitTM11.cpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2015-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2015-05-17 683 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -39,7 +40,7 @@ namespace Retro {
RtclRw11UnitTM11::RtclRw11UnitTM11(
Tcl_Interp* interp, const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitTM11>& spunit)
const std::shared_ptr<Rw11UnitTM11>& spunit)
: RtclRw11UnitBase<Rw11UnitTM11,Rw11UnitTape,
RtclRw11UnitTape>("Rw11UnitTM11", spunit)
{

View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11UnitTM11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11UnitTM11.hpp 1078 2018-12-08 14:19:03Z mueller $
//
// Copyright 2015-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-07 1078 1.2 use std::shared_ptr instead of boost
// 2017-04-08 870 1.1 inherit from RtclRw11UnitBase
// 2015-05-17 683 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -39,7 +40,7 @@ namespace Retro {
public:
RtclRw11UnitTM11(Tcl_Interp* interp,
const std::string& unitcmd,
const boost::shared_ptr<Rw11UnitTM11>& spunit);
const std::shared_ptr<Rw11UnitTM11>& spunit);
~RtclRw11UnitTM11();
protected: