mirror of
https://github.com/wfjm/w11.git
synced 2026-03-10 04:54:26 +00:00
use =delete for noncopyable instead of boost
This commit is contained in:
wfjm
@@ -107,6 +107,7 @@ The full set of tests is only run for tagged releases.
|
||||
- use std::shared_ptr instead of boost
|
||||
- use std::function instead of boost
|
||||
- use std::bind or in most cases a lambda instead of boost::bind
|
||||
- use =delete for noncopyable instead of boost
|
||||
- reduce usage of pointers in APIs
|
||||
- add HasPort/HasVirt(); Port() and Virt() return reference
|
||||
- rw11/shell.tcl: add workaround for tclreadline and `after` interference
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// $Id: ReventFd.hpp 983 2018-01-02 20:35:59Z mueller $
|
||||
// $Id: ReventFd.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.0.1 use =delete for noncopyable instead of boost
|
||||
// 2013-01-14 475 1.0 Initial version
|
||||
// 2013-01-11 473 0.5 First draft
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -26,15 +27,16 @@
|
||||
#ifndef included_Retro_ReventFd
|
||||
#define included_Retro_ReventFd 1
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class ReventFd : private boost::noncopyable {
|
||||
class ReventFd {
|
||||
public:
|
||||
ReventFd();
|
||||
virtual ~ReventFd();
|
||||
|
||||
ReventFd(const ReventFd&) = delete; // noncopyable
|
||||
ReventFd& operator=(const ReventFd&) = delete; // noncopyable
|
||||
|
||||
int Fd() const;
|
||||
int Signal();
|
||||
int Wait();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: ReventLoop.hpp 1083 2018-12-15 19:19:16Z mueller $
|
||||
// $Id: ReventLoop.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.2.5 use =delete for noncopyable instead of boost
|
||||
// 2018-12-15 1083 1.2.4 AddPollHandler(): use rval ref and move
|
||||
// 2018-12-14 1081 1.2.3 use std::function instead of boost
|
||||
// 2018-12-07 1078 1.2.2 use std::shared_ptr instead of boost
|
||||
@@ -39,20 +40,22 @@
|
||||
#include <memory>
|
||||
#include <functional>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
#include "boost/thread/mutex.hpp"
|
||||
|
||||
#include "librtools/RlogFile.hpp"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class ReventLoop : private boost::noncopyable {
|
||||
class ReventLoop {
|
||||
public:
|
||||
typedef std::function<int(const pollfd&)> pollhdl_t;
|
||||
|
||||
ReventLoop();
|
||||
virtual ~ReventLoop();
|
||||
|
||||
ReventLoop(const ReventLoop&) = delete; // noncopyable
|
||||
ReventLoop& operator=(const ReventLoop&) = delete; // noncopyable
|
||||
|
||||
void AddPollHandler(pollhdl_t&& pollhdl,
|
||||
int fd, short events=POLLIN);
|
||||
bool TestPollHandler(int fd, short events=POLLIN);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: RlinkConnect.hpp 1079 2018-12-09 10:56:59Z mueller $
|
||||
// $Id: RlinkConnect.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 2.8.1 use =delete for noncopyable instead of boost
|
||||
// 2018-12-08 1079 2.8 add HasPort(); return ref for Port()
|
||||
// 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
|
||||
@@ -58,7 +59,6 @@
|
||||
#include <memory>
|
||||
#include <ostream>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
#include "boost/thread/recursive_mutex.hpp"
|
||||
|
||||
#include "librtools/RerrMsg.hpp"
|
||||
@@ -79,12 +79,15 @@ namespace Retro {
|
||||
|
||||
class RlinkServer; // forw decl to avoid circular incl
|
||||
|
||||
class RlinkConnect : public Rbits, private boost::noncopyable {
|
||||
class RlinkConnect : public Rbits {
|
||||
public:
|
||||
|
||||
RlinkConnect();
|
||||
~RlinkConnect();
|
||||
|
||||
RlinkConnect(const RlinkConnect&) = delete; // noncopyable
|
||||
RlinkConnect& operator=(const RlinkConnect&) = delete; // noncopyable
|
||||
|
||||
bool Open(const std::string& name, RerrMsg& emsg);
|
||||
void Close();
|
||||
bool IsOpen() const;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// $Id: RlinkPacketBuf.hpp 983 2018-01-02 20:35:59Z mueller $
|
||||
// $Id: RlinkPacketBuf.hpp 1084 2018-12-16 12:23:53Z mueller $
|
||||
//
|
||||
// Copyright 2011-2017 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-16 1084 2.0.2 use =delete for noncopyable instead of boost
|
||||
// 2017-04-07 868 2.0.1 Dump(): add detail arg
|
||||
// 2014-11-23 606 2.0 re-organize for rlink v4
|
||||
// 2013-04-21 509 1.0.2 add SndAttn() method
|
||||
@@ -34,20 +35,21 @@
|
||||
#include <ostream>
|
||||
#include <vector>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "librtools/Rstats.hpp"
|
||||
|
||||
#include "RlinkCrc16.hpp"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RlinkPacketBuf : private boost::noncopyable {
|
||||
class RlinkPacketBuf {
|
||||
public:
|
||||
|
||||
RlinkPacketBuf();
|
||||
~RlinkPacketBuf();
|
||||
|
||||
RlinkPacketBuf(const RlinkPacketBuf&) = delete; // noncopy
|
||||
RlinkPacketBuf& operator=(const RlinkPacketBuf&) = delete; // noncopyable
|
||||
|
||||
size_t PktSize() const;
|
||||
|
||||
uint32_t Flags() const;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: RlinkPort.hpp 1078 2018-12-08 14:19:03Z mueller $
|
||||
// $Id: RlinkPort.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.4.4 use =delete for noncopyable instead of boost
|
||||
// 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
|
||||
@@ -42,8 +43,6 @@
|
||||
#include <map>
|
||||
#include <memory>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "librtools/RerrMsg.hpp"
|
||||
#include "librtools/RlogFile.hpp"
|
||||
#include "librtools/Rstats.hpp"
|
||||
@@ -52,13 +51,16 @@
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RlinkPort : private boost::noncopyable {
|
||||
class RlinkPort {
|
||||
public:
|
||||
typedef std::unique_ptr<RlinkPort> port_uptr_t;
|
||||
|
||||
RlinkPort();
|
||||
virtual ~RlinkPort();
|
||||
|
||||
RlinkPort(const RlinkPort&) = delete; // noncopyable
|
||||
RlinkPort& operator=(const RlinkPort&) = delete; // noncopyable
|
||||
|
||||
virtual bool Open(const std::string& url, RerrMsg& emsg) = 0;
|
||||
virtual void Close();
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: RlinkServer.hpp 1083 2018-12-15 19:19:16Z mueller $
|
||||
// $Id: RlinkServer.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 2.2.5 use =delete for noncopyable instead of boost
|
||||
// 2018-12-15 1083 2.2.4 for std::function setups: use rval ref and move
|
||||
// 2018-12-14 1081 2.2.3 use std::function instead of boost
|
||||
// 2018-12-07 1078 2.2.2 use std::shared_ptr instead of boost
|
||||
@@ -42,7 +43,6 @@
|
||||
#include <memory>
|
||||
#include <functional>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
#include "boost/thread/thread.hpp"
|
||||
|
||||
#include "librtools/Rstats.hpp"
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RlinkServer : private boost::noncopyable {
|
||||
class RlinkServer {
|
||||
public:
|
||||
|
||||
struct AttnArgs {
|
||||
@@ -72,6 +72,9 @@ namespace Retro {
|
||||
|
||||
explicit RlinkServer();
|
||||
virtual ~RlinkServer();
|
||||
|
||||
RlinkServer(const RlinkServer&) = delete; // noncopyable
|
||||
RlinkServer& operator=(const RlinkServer&) = delete; // noncopyable
|
||||
|
||||
void SetConnect(const std::shared_ptr<RlinkConnect>& spconn);
|
||||
const std::shared_ptr<RlinkConnect>& ConnectSPtr() const;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// $Id: RtimerFd.hpp 983 2018-01-02 20:35:59Z mueller $
|
||||
// $Id: RtimerFd.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.0.1 use =delete for noncopyable instead of boost
|
||||
// 2017-02-18 852 1.0 Initial version
|
||||
// 2013-01-11 473 0.1 First draft
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -28,17 +29,18 @@
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "librtools/Rtime.hpp"
|
||||
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RtimerFd : private boost::noncopyable {
|
||||
class RtimerFd {
|
||||
public:
|
||||
RtimerFd();
|
||||
virtual ~RtimerFd();
|
||||
|
||||
RtimerFd(const RtimerFd&) = delete; // noncopyable
|
||||
RtimerFd& operator=(const RtimerFd&) = delete; // noncopyable
|
||||
|
||||
void Open(clockid_t clkid=CLOCK_MONOTONIC);
|
||||
bool IsOpen() const;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// $Id: RtclClassBase.hpp 1052 2018-09-30 08:10:52Z mueller $
|
||||
// $Id: RtclClassBase.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.0.2 use =delete for noncopyable instead of boost
|
||||
// 2011-04-24 380 1.0.1 use boost::noncopyable (instead of private dcl's)
|
||||
// 2011-02-20 363 1.0 Initial version
|
||||
// 2011-02-11 360 0.1 First draft
|
||||
@@ -26,17 +27,18 @@
|
||||
#ifndef included_Retro_RtclClassBase
|
||||
#define included_Retro_RtclClassBase 1
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "tcl.h"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RtclClassBase : private boost::noncopyable {
|
||||
class RtclClassBase {
|
||||
public:
|
||||
|
||||
explicit RtclClassBase(const std::string& type = std::string());
|
||||
virtual ~RtclClassBase();
|
||||
virtual ~RtclClassBase();
|
||||
|
||||
RtclClassBase(const RtclClassBase&) = delete; // noncopyable
|
||||
RtclClassBase& operator=(const RtclClassBase&) = delete; // noncopyable
|
||||
|
||||
const std::string& Type() const;
|
||||
Tcl_Command Token() const;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: RtclCmdBase.hpp 1083 2018-12-15 19:19:16Z mueller $
|
||||
// $Id: RtclCmdBase.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.1.4 use =delete for noncopyable instead of boost
|
||||
// 2018-12-15 1083 1.1.3 AddMeth(): use rval ref and move semantics
|
||||
// 2018-12-14 1081 1.1.2 use std::function instead of boost
|
||||
// 2017-04-02 865 1.1.1 add GetArgsDump()
|
||||
@@ -36,13 +37,11 @@
|
||||
#include <map>
|
||||
#include <functional>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "RtclArgs.hpp"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RtclCmdBase : private boost::noncopyable {
|
||||
class RtclCmdBase {
|
||||
public:
|
||||
typedef std::function<int(RtclArgs&)> methfo_t;
|
||||
|
||||
@@ -53,6 +52,9 @@ namespace Retro {
|
||||
RtclCmdBase();
|
||||
virtual ~RtclCmdBase();
|
||||
|
||||
RtclCmdBase(const RtclCmdBase&) = delete; // noncopyable
|
||||
RtclCmdBase& operator=(const RtclCmdBase&) = delete; // noncopyable
|
||||
|
||||
int DispatchCmd(RtclArgs& args);
|
||||
void AddMeth(const std::string& name, methfo_t&& methfo);
|
||||
void DelMeth(const std::string& name);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// $Id: RtclContext.hpp 1066 2018-11-10 11:21:53Z mueller $
|
||||
// $Id: RtclContext.hpp 1084 2018-12-16 12:23:53Z mueller $
|
||||
//
|
||||
// Copyright 2011-2017 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-16 1084 1.0.5 use =delete for noncopyable instead of boost
|
||||
// 2017-02-04 866 1.0.4 rename fMapContext -> fContextMap
|
||||
// 2013-01-12 474 1.0.3 add FindProxy() method
|
||||
// 2011-04-24 380 1.0.2 use boost::noncopyable (instead of private dcl's)
|
||||
@@ -35,14 +36,12 @@
|
||||
#include <set>
|
||||
#include <map>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "RtclClassBase.hpp"
|
||||
#include "RtclProxyBase.hpp"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RtclContext : private boost::noncopyable {
|
||||
class RtclContext {
|
||||
public:
|
||||
typedef std::set<RtclClassBase*> cset_t;
|
||||
typedef std::set<RtclProxyBase*> pset_t;
|
||||
@@ -50,6 +49,9 @@ namespace Retro {
|
||||
|
||||
explicit RtclContext(Tcl_Interp* interp);
|
||||
virtual ~RtclContext();
|
||||
|
||||
RtclContext(const RtclContext&) = delete; // noncopyable
|
||||
RtclContext& operator=(const RtclContext&) = delete; // noncopyable
|
||||
|
||||
void RegisterClass(RtclClassBase* pobj);
|
||||
void UnRegisterClass(RtclClassBase* pobj);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: RtclGetList.hpp 1083 2018-12-15 19:19:16Z mueller $
|
||||
// $Id: RtclGetList.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.2.3 use =delete for noncopyable instead of boost
|
||||
// 2018-12-15 1083 1.2.2 Add(): use rval ref and move semantics
|
||||
// 2018-12-14 1081 1.2.1 use std::function instead of boost
|
||||
// 2018-12-01 1076 1.2 use unique_ptr
|
||||
@@ -35,19 +36,20 @@
|
||||
#include <map>
|
||||
#include <functional>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "RtclGet.hpp"
|
||||
#include "librtcltools/RtclArgs.hpp"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RtclGetList : private boost::noncopyable {
|
||||
class RtclGetList {
|
||||
public:
|
||||
typedef std::unique_ptr<RtclGetBase> get_uptr_t;
|
||||
|
||||
RtclGetList();
|
||||
virtual ~RtclGetList();
|
||||
|
||||
RtclGetList(const RtclGetList&) = delete; // noncopyable
|
||||
RtclGetList& operator=(const RtclGetList&) = delete; // noncopyable
|
||||
|
||||
void Add(const std::string& name, get_uptr_t&& upget);
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: RtclSetList.hpp 1083 2018-12-15 19:19:16Z mueller $
|
||||
// $Id: RtclSetList.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.2.3 use =delete for noncopyable instead of boost
|
||||
// 2018-12-15 1083 1.2.2 Add(): use rval ref and move semantics
|
||||
// 2018-12-14 1081 1.2.1 use std::function instead of boost
|
||||
// 2018-12-01 1076 1.2 use unique_ptr
|
||||
@@ -35,20 +36,21 @@
|
||||
#include <map>
|
||||
#include <functional>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "RtclSet.hpp"
|
||||
#include "librtcltools/RtclArgs.hpp"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RtclSetList : private boost::noncopyable {
|
||||
class RtclSetList {
|
||||
public:
|
||||
typedef std::unique_ptr<RtclSetBase> set_uptr_t;
|
||||
|
||||
RtclSetList();
|
||||
virtual ~RtclSetList();
|
||||
|
||||
RtclSetList(const RtclSetList&) = delete; // noncopyable
|
||||
RtclSetList& operator=(const RtclSetList&) = delete; // noncopyable
|
||||
|
||||
void Add(const std::string& name, set_uptr_t&& upset);
|
||||
|
||||
template <class TP>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// $Id: RlogFile.hpp 983 2018-01-02 20:35:59Z mueller $
|
||||
// $Id: RlogFile.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 2.2.1 use =delete for noncopyable instead of boost
|
||||
// 2015-01-08 631 2.2 Open(): now with RerrMsg and cout/cerr support
|
||||
// 2013-02-23 492 2.1 add Name(), keep log file name; add Dump()
|
||||
// 2013-02-22 491 2.0 add Write(),IsNew(), RlogMsg iface; use lockable
|
||||
@@ -32,7 +33,6 @@
|
||||
#include <ostream>
|
||||
#include <fstream>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
#include "boost/thread/mutex.hpp"
|
||||
|
||||
#include "RerrMsg.hpp"
|
||||
@@ -41,12 +41,15 @@ namespace Retro {
|
||||
|
||||
class RlogMsg; // forw decl to avoid circular incl
|
||||
|
||||
class RlogFile : private boost::noncopyable {
|
||||
class RlogFile {
|
||||
public:
|
||||
RlogFile();
|
||||
explicit RlogFile(std::ostream* os, const std::string& name = "");
|
||||
~RlogFile();
|
||||
|
||||
RlogFile(const RlogFile&) = delete; // noncopyable
|
||||
RlogFile& operator=(const RlogFile&) = delete; // noncopyable
|
||||
|
||||
bool IsNew() const;
|
||||
bool Open(std::string name, RerrMsg& emsg);
|
||||
void Close();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: RlogFileCatalog.hpp 1078 2018-12-08 14:19:03Z mueller $
|
||||
// $Id: RlogFileCatalog.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.0.2 use =delete for noncopyable instead of boost
|
||||
// 2018-12-07 1078 1.0.1 use std::shared_ptr instead of boost
|
||||
// 2013-02-22 491 1.0 Initial version
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -28,13 +29,11 @@
|
||||
#include <map>
|
||||
#include <memory>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "RlogFile.hpp"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RlogFileCatalog : private boost::noncopyable {
|
||||
class RlogFileCatalog {
|
||||
public:
|
||||
|
||||
static RlogFileCatalog& Obj();
|
||||
@@ -46,7 +45,10 @@ namespace Retro {
|
||||
RlogFileCatalog();
|
||||
~RlogFileCatalog();
|
||||
|
||||
protected:
|
||||
RlogFileCatalog(const RlogFileCatalog&) = delete; // noncopy
|
||||
RlogFileCatalog& operator=(const RlogFileCatalog&) = delete; // noncopy
|
||||
|
||||
protected:
|
||||
typedef std::map<std::string, std::shared_ptr<RlogFile>> map_t;
|
||||
|
||||
map_t fMap; //!< name->rlogfile map
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// $Id: RlogMsg.hpp 983 2018-01-02 20:35:59Z mueller $
|
||||
// $Id: RlogMsg.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.0.1 use =delete for noncopyable instead of boost
|
||||
// 2013-02-22 490 1.0 Initial version
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@@ -26,18 +27,19 @@
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class RlogFile; // forw decl to avoid circular incl
|
||||
|
||||
class RlogMsg : private boost::noncopyable {
|
||||
class RlogMsg {
|
||||
public:
|
||||
explicit RlogMsg(char tag = 0);
|
||||
RlogMsg(RlogFile& lfile, char tag = 0);
|
||||
~RlogMsg();
|
||||
|
||||
RlogMsg(const RlogMsg&) = delete; // noncopyable
|
||||
RlogMsg& operator=(const RlogMsg&) = delete; // noncopyable
|
||||
|
||||
void SetTag(char tag);
|
||||
void SetString(const std::string& str);
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: Rw11.hpp 1078 2018-12-08 14:19:03Z mueller $
|
||||
// $Id: Rw11.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.1.3 use =delete for noncopyable instead of boost
|
||||
// 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
|
||||
@@ -31,19 +32,20 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "librlink/RlinkServer.hpp"
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class Rw11Cpu; // forw decl to avoid circular incl
|
||||
|
||||
class Rw11 : private boost::noncopyable {
|
||||
class Rw11 {
|
||||
public:
|
||||
|
||||
Rw11();
|
||||
virtual ~Rw11();
|
||||
|
||||
Rw11(const Rw11&) = delete; // noncopyable
|
||||
Rw11& operator=(const Rw11&) = delete; // noncopyable
|
||||
|
||||
void SetServer(const std::shared_ptr<RlinkServer>& spserv);
|
||||
const std::shared_ptr<RlinkServer>& ServerSPtr() const;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// $Id: Rw11Cntl.hpp 983 2018-01-02 20:35:59Z mueller $
|
||||
// $Id: Rw11Cntl.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.2.3 use =delete for noncopyable instead of boost
|
||||
// 2017-04-15 874 1.2.2 NUnit() now pure; add UnitBase()
|
||||
// 2017-04-02 865 1.2.1 Dump(): add detail arg
|
||||
// 2017-02-04 848 1.2 add ProbeFound(),ProbeDataInt,Rem()
|
||||
@@ -33,8 +34,6 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "librtools/Rstats.hpp"
|
||||
#include "librlink/RlinkConnect.hpp"
|
||||
#include "librlink/RlinkServer.hpp"
|
||||
@@ -47,12 +46,15 @@ namespace Retro {
|
||||
|
||||
class Rw11Unit; // forw decl to avoid circular incl
|
||||
|
||||
class Rw11Cntl : public Rbits, private boost::noncopyable {
|
||||
class Rw11Cntl : public Rbits {
|
||||
public:
|
||||
|
||||
explicit Rw11Cntl(const std::string& type);
|
||||
virtual ~Rw11Cntl();
|
||||
|
||||
Rw11Cntl(const Rw11Cntl&) = delete; // noncopyable
|
||||
Rw11Cntl& operator=(const Rw11Cntl&) = delete; // noncopyable
|
||||
|
||||
void SetCpu(Rw11Cpu* pcpu);
|
||||
Rw11Cpu& Cpu() const;
|
||||
Rw11& W11() const;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: Rw11Cpu.hpp 1078 2018-12-08 14:19:03Z mueller $
|
||||
// $Id: Rw11Cpu.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.2.13 use =delete for noncopyable instead of boost
|
||||
// 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
|
||||
@@ -47,7 +48,6 @@
|
||||
#include <memory>
|
||||
#include <map>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
#include "boost/thread/locks.hpp"
|
||||
#include "boost/thread/condition_variable.hpp"
|
||||
|
||||
@@ -65,12 +65,15 @@ namespace Retro {
|
||||
|
||||
class Rw11Cntl; // forw decl to avoid circular incl
|
||||
|
||||
class Rw11Cpu : public Rbits, private boost::noncopyable {
|
||||
class Rw11Cpu : public Rbits {
|
||||
public:
|
||||
typedef std::map<std::string, std::shared_ptr<Rw11Cntl>> cmap_t;
|
||||
|
||||
explicit Rw11Cpu(const std::string& type);
|
||||
virtual ~Rw11Cpu();
|
||||
|
||||
Rw11Cpu(const Rw11Cpu&) = delete; // noncopyable
|
||||
Rw11Cpu& operator=(const Rw11Cpu&) = delete; // noncopyable
|
||||
|
||||
void Setup(Rw11* pw11);
|
||||
Rw11& W11() const;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// $Id: Rw11Rdma.hpp 1083 2018-12-15 19:19:16Z mueller $
|
||||
// $Id: Rw11Rdma.hpp 1084 2018-12-16 12:23:53Z mueller $
|
||||
//
|
||||
// Copyright 2015-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
|
||||
//
|
||||
@@ -13,6 +13,7 @@
|
||||
//
|
||||
// Revision History:
|
||||
// Date Rev Version Comment
|
||||
// 2018-12-16 1084 1.1.4 use =delete for noncopyable instead of boost
|
||||
// 2018-12-15 1083 1.1.3 for std::function setups: use rval ref and move
|
||||
// 2018-12-14 1081 1.1.2 use std::function instead of boost
|
||||
// 2017-04-02 865 1.1.1 Dump(): add detail arg
|
||||
@@ -31,8 +32,6 @@
|
||||
|
||||
#include <functional>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "librtools/Rstats.hpp"
|
||||
#include "librtools/RerrMsg.hpp"
|
||||
|
||||
@@ -41,7 +40,7 @@
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class Rw11Rdma : public Rbits, private boost::noncopyable {
|
||||
class Rw11Rdma : public Rbits {
|
||||
public:
|
||||
|
||||
typedef std::function<void(int,size_t,size_t,
|
||||
@@ -53,6 +52,9 @@ namespace Retro {
|
||||
postcb_t&& postcb);
|
||||
virtual ~Rw11Rdma();
|
||||
|
||||
Rw11Rdma(const Rw11Rdma&) = delete; // noncopyable
|
||||
Rw11Rdma& operator=(const Rw11Rdma&) = delete; // noncopyable
|
||||
|
||||
Rw11Cntl& CntlBase() const;
|
||||
Rw11Cpu& Cpu() const;
|
||||
Rw11& W11() const;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// $Id: Rw11Unit.hpp 983 2018-01-02 20:35:59Z mueller $
|
||||
// $Id: Rw11Unit.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.1.4 use =delete for noncopyable instead of boost
|
||||
// 2017-04-15 875 1.1.3 add VirtBase(), IsAttached(), AttachUrl()
|
||||
// 2017-04-07 868 1.1.2 Dump(): add detail arg
|
||||
// 2015-05-13 680 1.1.1 add Enabled()
|
||||
@@ -33,8 +34,6 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "librtools/Rstats.hpp"
|
||||
#include "librtools/RerrMsg.hpp"
|
||||
#include "librlink/RlinkServer.hpp"
|
||||
@@ -46,12 +45,15 @@ namespace Retro {
|
||||
|
||||
class Rw11Virt; // forw decl to avoid circular incl
|
||||
|
||||
class Rw11Unit : public Rbits, private boost::noncopyable {
|
||||
class Rw11Unit : public Rbits {
|
||||
public:
|
||||
|
||||
Rw11Unit(Rw11Cntl* pcntl, size_t index);
|
||||
virtual ~Rw11Unit();
|
||||
|
||||
Rw11Unit(const Rw11Unit&) = delete; // noncopyable
|
||||
Rw11Unit& operator=(const Rw11Unit&) = delete; // noncopyable
|
||||
|
||||
size_t Index() const;
|
||||
std::string Name() const;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// $Id: Rw11Virt.hpp 1052 2018-09-30 08:10:52Z mueller $
|
||||
// $Id: Rw11Virt.hpp 1084 2018-12-16 12:23:53Z 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-16 1084 1.1.3 use =delete for noncopyable instead of boost
|
||||
// 2017-04-15 875 1.1.2 add Url() const getter
|
||||
// 2017-04-07 868 1.1.1 Dump(): add detail arg
|
||||
// 2017-04-02 864 1.1 add fWProt,WProt()
|
||||
@@ -32,8 +33,6 @@
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
#include "librtools/RparseUrl.hpp"
|
||||
#include "librtools/RerrMsg.hpp"
|
||||
#include "librtools/Rstats.hpp"
|
||||
@@ -41,11 +40,14 @@
|
||||
|
||||
namespace Retro {
|
||||
|
||||
class Rw11Virt : private boost::noncopyable {
|
||||
class Rw11Virt {
|
||||
public:
|
||||
explicit Rw11Virt(Rw11Unit* punit);
|
||||
virtual ~Rw11Virt();
|
||||
|
||||
Rw11Virt(const Rw11Virt&) = delete; // noncopyable
|
||||
Rw11Virt& operator=(const Rw11Virt&) = delete; // noncopyable
|
||||
|
||||
Rw11Unit& Unit() const;
|
||||
Rw11Cntl& Cntl() const;
|
||||
Rw11Cpu& Cpu() const;
|
||||
|
||||
Reference in New Issue
Block a user