Skip to content

Commit

Permalink
Merge pull request #11046 from stiopaa1/common_timer_deleteCopyConstr…
Browse files Browse the repository at this point in the history
…AndAssign

common/Timer.h: delete copy constr and assign op

Reviewed-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
tchaikov committed Sep 13, 2016
2 parents 77b0cc5 + d4c48fd commit 3b2c094
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/common/Timer.h
Expand Up @@ -27,10 +27,6 @@ class SafeTimerThread;

class SafeTimer
{
// This class isn't supposed to be copied
SafeTimer(const SafeTimer &rhs);
SafeTimer& operator=(const SafeTimer &rhs);

CephContext *cct;
Mutex& lock;
Cond cond;
Expand All @@ -49,6 +45,10 @@ class SafeTimer
void dump(const char *caller = 0) const;

public:
// This class isn't supposed to be copied
SafeTimer(const SafeTimer&) = delete;
SafeTimer& operator=(const SafeTimer&) = delete;

/* Safe callbacks determines whether callbacks are called with the lock
* held.
*
Expand Down

0 comments on commit 3b2c094

Please sign in to comment.