diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-08-01 11:52:47 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-08-01 11:52:47 -0700 |
| commit | 0fd6808e21755e55603f99086e28b47fe1348f04 (patch) | |
| tree | b37c08ca4c3073c4c65a9849335d03476501c970 /node/Node.hpp | |
| parent | c9b4028cd32e940a3ccd1c44cb6ebcf850e145d0 (diff) | |
| parent | bf193dd3cfee7c343c5efd7b06df034d8b731d47 (diff) | |
| download | infinitytier-0fd6808e21755e55603f99086e28b47fe1348f04.tar.gz infinitytier-0fd6808e21755e55603f99086e28b47fe1348f04.zip | |
Merge branch 'master' into android-jni
Diffstat (limited to 'node/Node.hpp')
| -rw-r--r-- | node/Node.hpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/node/Node.hpp b/node/Node.hpp index 0e966aa6..2a283eab 100644 --- a/node/Node.hpp +++ b/node/Node.hpp @@ -248,9 +248,6 @@ private: ZT1_VirtualNetworkConfigFunction _virtualNetworkConfigFunction; ZT1_EventCallback _eventCallback; - //Dictionary _localConfig; // persisted as local.conf - //Mutex _localConfig_m; - std::vector< std::pair< uint64_t, SharedPtr<Network> > > _networks; Mutex _networks_m; |