josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dep: zmqpp: don't specify namespace while inside same namespace

Browse Source
This commit is contained in:
Bernd Lörwald
2014-10-22 23:59:39 +02:00
parent cffbcea877
commit 2b6669c544
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/zmqpp/zmqpp/inet.hpp
+2 -2
View File
@@ -142,7 +142,7 @@ inline double htond(double value)
uint64_t temp;
memcpy(&temp, &value, sizeof(uint64_t));
temp = zmqpp::htonll(temp);
temp = htonll(temp);
memcpy(&value, &temp, sizeof(uint64_t));
return value;
@@ -160,7 +160,7 @@ inline double ntohd(double value)
uint64_t temp;
memcpy(&temp, &value, sizeof(uint64_t));
temp = zmqpp::ntohll(temp);
temp = ntohll(temp);
memcpy(&value, &temp, sizeof(uint64_t));
return value;
dep/zmqpp/zmqpp/message.cpp
+6 -6
View File
@@ -138,7 +138,7 @@ void message::get(int64_t& integer, size_t const part) const
assert(sizeof(int64_t) == size(part));
uint64_t const* network_order = static_cast<uint64_t const*>(raw_data(part));
integer = static_cast<int64_t>(zmqpp::htonll(*network_order));
integer = static_cast<int64_t>(htonll(*network_order));
}
void message::get(uint8_t& unsigned_integer, size_t const part) const
@@ -170,7 +170,7 @@ void message::get(uint64_t& unsigned_integer, size_t const part) const
assert(sizeof(uint64_t) == size(part));
uint64_t const* network_order = static_cast<uint64_t const*>(raw_data(part));
unsigned_integer = zmqpp::ntohll(*network_order);
unsigned_integer = ntohll(*network_order);
}
void message::get(float& floating_point, size_t const part) const
@@ -228,7 +228,7 @@ message& message::operator<<(int32_t const integer)
message& message::operator<<(int64_t const integer)
{
uint64_t network_order = zmqpp::htonll(static_cast<uint64_t>(integer));
uint64_t network_order = htonll(static_cast<uint64_t>(integer));
add(reinterpret_cast<void const*>(&network_order), sizeof(uint64_t));
return *this;
@@ -259,7 +259,7 @@ message& message::operator<<(uint32_t const unsigned_integer)
message& message::operator<<(uint64_t const unsigned_integer)
{
uint64_t network_order = zmqpp::htonll(unsigned_integer);
uint64_t network_order = htonll(unsigned_integer);
add(reinterpret_cast<void const*>(&network_order), sizeof(uint64_t));
return *this;
@@ -329,7 +329,7 @@ void message::push_front(int32_t const integer)
void message::push_front(int64_t const integer)
{
uint64_t network_order = zmqpp::htonll(static_cast<uint64_t>(integer));
uint64_t network_order = htonll(static_cast<uint64_t>(integer));
push_front(&network_order, sizeof(uint64_t));
}
@@ -353,7 +353,7 @@ void message::push_front(uint32_t const unsigned_integer)
void message::push_front(uint64_t const unsigned_integer)
{
uint64_t network_order = zmqpp::htonll(unsigned_integer);
uint64_t network_order = htonll(unsigned_integer);
push_front(&network_order, sizeof(uint64_t));
}