Skip to content

Commit

Permalink
Do not need boost::noncopyable anymore!
Browse files Browse the repository at this point in the history
  • Loading branch information
aguinet committed Feb 26, 2019
1 parent bb0f1e3 commit 402d562
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
4 changes: 3 additions & 1 deletion include/usbtop/usb_bus.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

namespace usbtop {

class UsbBus: boost::noncopyable
class UsbBus
{
public:
typedef size_t id_type;
Expand All @@ -68,6 +68,8 @@ class UsbBus: boost::noncopyable
_stats(std::move(o._stats))
{ }

UsbBus(UsbBus const&) = delete;

~UsbBus();

public:
Expand Down
4 changes: 3 additions & 1 deletion include/usbtop/usb_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace usbtop {

class UsbBus;

class UsbDevice: boost::noncopyable
class UsbDevice
{
friend class UsbBus;

Expand All @@ -57,6 +57,8 @@ class UsbDevice: boost::noncopyable
_bus(o._bus)
{ }

UsbDevice(UsbDevice const&) = delete;

public:
void push(const double ts, const size_t size, const UsbStats::direction_type dir);

Expand Down
8 changes: 6 additions & 2 deletions include/usbtop/usb_stats.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

namespace usbtop {

class Stats: boost::noncopyable
class Stats
{
typedef std::pair<double, size_t> sample_t;
public:
Expand All @@ -52,6 +52,8 @@ class Stats: boost::noncopyable
inst_data_(std::move(o.inst_data_))
{ }

Stats(Stats const& o) = delete;

public:
static void init();
void push(double timestamp, size_t spacket);
Expand Down Expand Up @@ -79,7 +81,7 @@ class Stats: boost::noncopyable
double stats_window_;
};

class UsbStats: boost::noncopyable
class UsbStats
{
public:
// The order of this enum is important !! (cf. UsbBus::push)
Expand All @@ -96,6 +98,8 @@ class UsbStats: boost::noncopyable
_to_device(std::move(o._to_device))
{ }

UsbStats(UsbStats const&) = delete;

public:
inline void push(const double ts, const size_t size, const direction_type dir)
{
Expand Down

0 comments on commit 402d562

Please sign in to comment.