diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
| commit | c430d88bd40d178685ac0a2e648d8c4ea675996c (patch) | |
| tree | f69f497428fa34c6389173d39c889563dea9506c /node/IncomingPacket.hpp | |
| parent | 9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60 (diff) | |
| parent | d9006712f6ffc975d97097caf2d2b4264405b32c (diff) | |
| download | infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.tar.gz infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Conflicts:
.gitignore
Diffstat (limited to 'node/IncomingPacket.hpp')
| -rw-r--r-- | node/IncomingPacket.hpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/node/IncomingPacket.hpp b/node/IncomingPacket.hpp index 5940a78e..174fa38d 100644 --- a/node/IncomingPacket.hpp +++ b/node/IncomingPacket.hpp @@ -73,15 +73,13 @@ public: * @param data Packet data * @param len Packet length * @param remoteAddress Address from which packet came - * @param linkDesperation Link desperation for link over which packet was received * @param now Current time * @throws std::out_of_range Range error processing packet */ - IncomingPacket(const void *data,unsigned int len,const InetAddress &remoteAddress,unsigned int linkDesperation,uint64_t now) : + IncomingPacket(const void *data,unsigned int len,const InetAddress &remoteAddress,uint64_t now) : Packet(data,len), _receiveTime(now), _remoteAddress(remoteAddress), - _linkDesperation(linkDesperation), __refCount() { } @@ -129,7 +127,6 @@ private: uint64_t _receiveTime; InetAddress _remoteAddress; - unsigned int _linkDesperation; AtomicCounter __refCount; }; |