void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 04:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small build fixes.

Browse source
This commit is contained in:
Adam Ierymenko 2020-03-30 18:09:11 -07:00
parent 9428fc53f6
commit b3314cd34f
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
node/Dictionary.cpp
View file

@ -31,7 +31,7 @@ std::vector<uint8_t> &Dictionary::operator[](const char *k)
const std::vector<uint8_t> &Dictionary::operator[](const char *k) const const std::vector<uint8_t> &Dictionary::operator[](const char *k) const
{ {
static const std::vector<uint8_t> emptyEntry; static const std::vector<uint8_t> emptyEntry;
std::map< uint64_t,std::vector<uint8_t> >::const_iterator e(_t.find(_toKey(k))); Map< uint64_t,std::vector<uint8_t> >::const_iterator e(_t.find(_toKey(k)));
return (e == _t.end()) ? emptyEntry : e->second; return (e == _t.end()) ? emptyEntry : e->second;
} }
@ -156,7 +156,7 @@ void Dictionary::encode(std::vector<uint8_t> &out) const
out.clear(); out.clear();
for(std::map< uint64_t,std::vector<uint8_t> >::const_iterator ti(_t.begin());ti!=_t.end();++ti) { for(Map< uint64_t,std::vector<uint8_t> >::const_iterator ti(_t.begin());ti!=_t.end();++ti) {
str[0] = ti->first; str[0] = ti->first;
const char *k = (const char *)str; const char *k = (const char *)str;
for(;;) { for(;;) {

4
node/Dictionary.hpp
View file

@ -18,10 +18,10 @@
#include "Utils.hpp" #include "Utils.hpp"
#include "Address.hpp" #include "Address.hpp"
#include "Buf.hpp" #include "Buf.hpp"
#include "Map.hpp"
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include <map>
namespace ZeroTier { namespace ZeroTier {
@ -180,7 +180,7 @@ private:
return key; return key;
} }
std::map< uint64_t,std::vector<uint8_t> > _t; Map< uint64_t,std::vector<uint8_t> > _t;
}; };
} // namespace ZeroTier } // namespace ZeroTier

2
node/Map.hpp
View file

@ -84,7 +84,7 @@ public:
ZT_INLINE void set(const K &key,const V &value) ZT_INLINE void set(const K &key,const V &value)
{ {
this->emplace(key,value); (*this)[key] = value;
} }
}; };
#endif #endif