diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-03-13 21:57:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 21:57:07 +0100 |
| commit | 9dc4498a33c4e4529466b118df492f465b84517e (patch) | |
| tree | 03c13b027c588fe33a683ce6e301dcc9d81cceda /vespalib | |
| parent | 1558b5c4c793647d451dff2122118be01fa749a8 (diff) | |
| parent | b38312bf74d2c481d5485beaa547241b201ee0d9 (diff) | |
Merge pull request #8784 from vespa-engine/toregge/stop-naming-method-ntohll
Stop naming private method ntohll.
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/vespa/vespalib/objects/nbo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vespalib/src/vespa/vespalib/objects/nbo.h b/vespalib/src/vespa/vespalib/objects/nbo.h index b22cd7c79ce..eefa4d121e0 100644 --- a/vespalib/src/vespa/vespalib/objects/nbo.h +++ b/vespalib/src/vespa/vespalib/objects/nbo.h @@ -14,8 +14,8 @@ public: static uint16_t n2h(uint16_t v) { return ntohs(v); } static int32_t n2h(int32_t v) { return ntohl(v); } static uint32_t n2h(uint32_t v) { return ntohl(v); } - static int64_t n2h(int64_t v) { return ntohll(v); } - static uint64_t n2h(uint64_t v) { return ntohll(v); } + static int64_t n2h(int64_t v) { return nbo_ntohll(v); } + static uint64_t n2h(uint64_t v) { return nbo_ntohll(v); } static float n2h(float v) { union { uint32_t _u; float _f; } uf; uf._f = v; @@ -25,11 +25,11 @@ public: static double n2h(double v) { union { uint64_t _u; double _f; } uf; uf._f = v; - uf._u = ntohll(uf._u); + uf._u = nbo_ntohll(uf._u); return uf._f; } private: - static uint64_t ntohll(uint64_t v) { + static uint64_t nbo_ntohll(uint64_t v) { union { uint64_t _ll; uint32_t _l[2]; } w, r; r._ll = v; w._l[0] = n2h(r._l[1]); |