diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-12 13:19:53 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-12 13:19:53 -0800 |
| commit | 61fd8463f89c1f1b3e60b8297d65250710ddcc96 (patch) | |
| tree | 35fa5dc1e29d6b6fabfc5467fbd91ea40156b932 /node/Network.hpp | |
| parent | dd233fdb8d3360c47aedcf0dabab63aa29d80ef9 (diff) | |
| parent | 3883ac08c7736c9695f100c7937af089e00359d9 (diff) | |
| download | infinitytier-61fd8463f89c1f1b3e60b8297d65250710ddcc96.tar.gz infinitytier-61fd8463f89c1f1b3e60b8297d65250710ddcc96.zip | |
Merge branch 'dev' into edge
Diffstat (limited to 'node/Network.hpp')
| -rw-r--r-- | node/Network.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node/Network.hpp b/node/Network.hpp index cb696d12..3cf83963 100644 --- a/node/Network.hpp +++ b/node/Network.hpp @@ -335,7 +335,7 @@ public: /** * @return Pointer to user PTR (modifiable user ptr used in API) */ - inline void **userPtr() throw() { return &_uptr; } + inline void **userPtr() throw() { return &_uPtr; } inline bool operator==(const Network &n) const throw() { return (_id == n._id); } inline bool operator!=(const Network &n) const throw() { return (_id != n._id); } @@ -354,7 +354,7 @@ private: std::vector<MulticastGroup> _allMulticastGroups() const; const RuntimeEnvironment *RR; - void *_uptr; + void *_uPtr; uint64_t _id; MAC _mac; // local MAC address volatile bool _enabled; |