diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-15 14:44:30 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-15 14:44:30 -0700 |
| commit | a0f8685453bf25451b937b99cf1a4ab12f27bdcc (patch) | |
| tree | a701a64a9b66e2490c9deed5e8107bdc1a09b05c /service | |
| parent | 86395382999a0a98fd38e542f505c449421061b7 (diff) | |
| download | infinitytier-a0f8685453bf25451b937b99cf1a4ab12f27bdcc.tar.gz infinitytier-a0f8685453bf25451b937b99cf1a4ab12f27bdcc.zip | |
cleanup
Diffstat (limited to 'service')
| -rw-r--r-- | service/ControlPlane.cpp | 4 | ||||
| -rw-r--r-- | service/ControlPlane.hpp | 6 | ||||
| -rw-r--r-- | service/OneService.hpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 146c20d6..f65a9ee5 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -26,7 +26,7 @@ */ #include "ControlPlane.hpp" -#include "One.hpp" +#include "OneService.hpp" #include "../version.h" #include "../include/ZeroTierOne.h" @@ -196,7 +196,7 @@ static void _jsonAppend(std::string &buf,const ZT1_Peer *peer) buf.append(json); } -ControlPlane::ControlPlane(One *svc,Node *n) : +ControlPlane::ControlPlane(OneService *svc,Node *n) : _svc(svc), _node(n) { diff --git a/service/ControlPlane.hpp b/service/ControlPlane.hpp index a181eb5c..96d11762 100644 --- a/service/ControlPlane.hpp +++ b/service/ControlPlane.hpp @@ -36,7 +36,7 @@ namespace ZeroTier { -class One; +class OneService; class Node; struct InetAddress; @@ -46,7 +46,7 @@ struct InetAddress; class ControlPlane { public: - ControlPlane(One *svc,Node *n); + ControlPlane(OneService *svc,Node *n); ~ControlPlane(); /** @@ -71,7 +71,7 @@ public: std::string &responseContentType); private: - One *const _svc; + OneService *const _svc; Node *const _node; std::set<std::string> _authTokens; }; diff --git a/service/OneService.hpp b/service/OneService.hpp index 56f4fc3c..bba3b9b8 100644 --- a/service/OneService.hpp +++ b/service/OneService.hpp @@ -130,8 +130,8 @@ protected: OneService() {} private: - OneService(const One &one) {} - inline One &operator=(const One &one) { return *this; } + OneService(const OneService &one) {} + inline OneService &operator=(const OneService &one) { return *this; } }; } // namespace ZeroTier |