diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-01-26 21:34:56 -0500 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-01-26 21:34:56 -0500 |
| commit | 6d8e1e87830eb24a1ecd6b0a115c39ed43914b5c (patch) | |
| tree | 24d0bd761e49ed443773ca78442c4e8cce60a86b /osdep | |
| parent | 939ab43ceb3f4c0b7bf6d946f55f6a8e70d8fd4e (diff) | |
| download | infinitytier-6d8e1e87830eb24a1ecd6b0a115c39ed43914b5c.tar.gz infinitytier-6d8e1e87830eb24a1ecd6b0a115c39ed43914b5c.zip | |
More cleanup of old stuff.
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/Binder.hpp | 3 | ||||
| -rw-r--r-- | osdep/ManagedRoute.hpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/osdep/Binder.hpp b/osdep/Binder.hpp index d7c3f03c..93fad9f1 100644 --- a/osdep/Binder.hpp +++ b/osdep/Binder.hpp @@ -60,7 +60,6 @@ #include <set> #include <atomic> -#include "../node/NonCopyable.hpp" #include "../node/InetAddress.hpp" #include "../node/Mutex.hpp" #include "../node/Utils.hpp" @@ -87,7 +86,7 @@ namespace ZeroTier { * On OSes that do not support local port enumeration or where this is not * meaningful, this degrades to binding to wildcard. */ -class Binder : NonCopyable +class Binder { private: struct _Binding diff --git a/osdep/ManagedRoute.hpp b/osdep/ManagedRoute.hpp index 873d0cfb..779ad6a1 100644 --- a/osdep/ManagedRoute.hpp +++ b/osdep/ManagedRoute.hpp @@ -34,7 +34,6 @@ #include "../node/Utils.hpp" #include "../node/SharedPtr.hpp" #include "../node/AtomicCounter.hpp" -#include "../node/NonCopyable.hpp" #include <stdexcept> #include <vector> @@ -45,7 +44,7 @@ namespace ZeroTier { /** * A ZT-managed route that used C++ RAII semantics to automatically clean itself up on deallocate */ -class ManagedRoute : NonCopyable +class ManagedRoute { friend class SharedPtr<ManagedRoute>; @@ -91,6 +90,9 @@ public: inline const char *device() const { return _device; } private: + ManagedRoute(const ManagedRoute &) {} + inline ManagedRoute &operator=(const ManagedRoute &) { return *this; } + InetAddress _target; InetAddress _via; InetAddress _systemVia; // for route overrides |