Sfoglia il codice sorgente

A little more cleanup.

Adam Ierymenko 7 anni fa
parent
commit
e74cd4b4ef
1 ha cambiato i file con 5 aggiunte e 6 eliminazioni
  1. 5 6
      node/AtomicCounter.hpp

+ 5 - 6
node/AtomicCounter.hpp

@@ -28,7 +28,6 @@
 #define ZT_ATOMICCOUNTER_HPP
 #define ZT_ATOMICCOUNTER_HPP
 
 
 #include "Constants.hpp"
 #include "Constants.hpp"
-#include "NonCopyable.hpp"
 
 
 #ifndef __GNUC__
 #ifndef __GNUC__
 #include <atomic>
 #include <atomic>
@@ -39,13 +38,10 @@ namespace ZeroTier {
 /**
 /**
  * Simple atomic counter supporting increment and decrement
  * Simple atomic counter supporting increment and decrement
  */
  */
-class AtomicCounter : NonCopyable
+class AtomicCounter
 {
 {
 public:
 public:
-	AtomicCounter()
-	{
-		_v = 0;
-	}
+	AtomicCounter() { _v = 0; }
 
 
 	inline int load() const
 	inline int load() const
 	{
 	{
@@ -75,6 +71,9 @@ public:
 	}
 	}
 
 
 private:
 private:
+	AtomicCounter(const AtomicCounter &) {}
+	const AtomicCounter &operator=(const AtomicCounter &) { return *this; }
+
 #ifdef __GNUC__
 #ifdef __GNUC__
 	int _v;
 	int _v;
 #else
 #else