diff options
| author | Bernd Lörwald <bloerwald@googlemail.com> | 2014-10-22 23:54:24 +0200 |
|---|---|---|
| committer | Bernd Lörwald <bloerwald@googlemail.com> | 2014-10-22 23:59:39 +0200 |
| commit | 2b6669c544d62751e824f24d96a8228e549e17cf (patch) | |
| tree | ca8e845494d5a66cccef9ef66e5f0b93f00407a2 | |
| parent | cffbcea8776dcf1fd175bd678c04e1ca3eb440c1 (diff) | |
dep: zmqpp: don't specify namespace while inside same namespace
| -rw-r--r-- | dep/zmqpp/zmqpp/inet.hpp | 4 | ||||
| -rw-r--r-- | dep/zmqpp/zmqpp/message.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dep/zmqpp/zmqpp/inet.hpp b/dep/zmqpp/zmqpp/inet.hpp index 5245aa4143c..e62828dbf06 100644 --- a/dep/zmqpp/zmqpp/inet.hpp +++ b/dep/zmqpp/zmqpp/inet.hpp @@ -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; diff --git a/dep/zmqpp/zmqpp/message.cpp b/dep/zmqpp/zmqpp/message.cpp index 58587307364..4d81d247c62 100644 --- a/dep/zmqpp/zmqpp/message.cpp +++ b/dep/zmqpp/zmqpp/message.cpp @@ -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)); } |