generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-03-01 10:57:59 +01:00
Code Issues Projects Releases Wiki Activity

Make buffer constructors and functions constexpr

Browse Source
This commit is contained in:
Gudmundur Adalsteinsson 2019-05-09 22:47:57 +00:00
parent 99d98dd217
commit 809acb2dc8
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/buffer.cpp
View File

@ -14,8 +14,8 @@ using BT = int16_t;
TEST_CASE("buffer default ctor", "[buffer]")
{
zmq::mutable_buffer mb;
zmq::const_buffer cb;
constexpr zmq::mutable_buffer mb;
constexpr zmq::const_buffer cb;
CHECK(mb.size() == 0);
CHECK(mb.data() == nullptr);
CHECK(cb.size() == 0);
@ -36,6 +36,13 @@ TEST_CASE("buffer data ctor", "[buffer]")
CHECK(mb.data() == from_mut.data());
const auto cmb = mb;
static_assert(std::is_same<decltype(cmb.data()), void*>::value, "");
constexpr const void* cp = nullptr;
constexpr void* p = nullptr;
constexpr zmq::const_buffer cecb = zmq::buffer(p, 0);
constexpr zmq::mutable_buffer cemb = zmq::buffer(p, 0);
CHECK(cecb.data() == nullptr);
CHECK(cemb.data() == nullptr);
}
TEST_CASE("const_buffer operator+", "[buffer]")

30
zmq.hpp
View File

@ -734,14 +734,14 @@ constexpr recv_flags operator~(recv_flags a) noexcept
class mutable_buffer
{
public:
mutable_buffer() noexcept : _data(nullptr), _size(0) {}
mutable_buffer(void *p, size_t n) noexcept : _data(p), _size(n)
constexpr mutable_buffer() noexcept : _data(nullptr), _size(0) {}
constexpr mutable_buffer(void *p, size_t n) noexcept : _data(p), _size(n)
{
assert(p != nullptr || n == 0);
}
void *data() const noexcept { return _data; }
size_t size() const noexcept { return _size; }
constexpr void *data() const noexcept { return _data; }
constexpr size_t size() const noexcept { return _size; }
mutable_buffer &operator+=(size_t n) noexcept
{
// (std::min) is a workaround for when a min macro is defined
@ -769,16 +769,16 @@ inline mutable_buffer operator+(size_t n, const mutable_buffer &mb) noexcept
class const_buffer
{
public:
const_buffer() noexcept : _data(nullptr), _size(0) {}
const_buffer(const void *p, size_t n) noexcept : _data(p), _size(n) {}
const_buffer(const mutable_buffer &mb) noexcept :
constexpr const_buffer() noexcept : _data(nullptr), _size(0) {}
constexpr const_buffer(const void *p, size_t n) noexcept : _data(p), _size(n) {}
constexpr const_buffer(const mutable_buffer &mb) noexcept :
_data(mb.data()),
_size(mb.size())
{
}
const void *data() const noexcept { return _data; }
size_t size() const noexcept { return _size; }
constexpr const void *data() const noexcept { return _data; }
constexpr size_t size() const noexcept { return _size; }
const_buffer &operator+=(size_t n) noexcept
{
const auto shift = (std::min)(n, _size);
@ -805,27 +805,27 @@ inline const_buffer operator+(size_t n, const const_buffer &cb) noexcept
// buffer creation
inline mutable_buffer buffer(void* p, size_t n) noexcept
constexpr mutable_buffer buffer(void* p, size_t n) noexcept
{
return mutable_buffer(p, n);
}
inline const_buffer buffer(const void* p, size_t n) noexcept
constexpr const_buffer buffer(const void* p, size_t n) noexcept
{
return const_buffer(p, n);
}
inline mutable_buffer buffer(const mutable_buffer& mb) noexcept
constexpr mutable_buffer buffer(const mutable_buffer& mb) noexcept
{
return mb;
}
inline mutable_buffer buffer(const mutable_buffer& mb, size_t n) noexcept
constexpr mutable_buffer buffer(const mutable_buffer& mb, size_t n) noexcept
{
return mutable_buffer(mb.data(), (std::min)(mb.size(), n));
}
inline const_buffer buffer(const const_buffer& cb) noexcept
constexpr const_buffer buffer(const const_buffer& cb) noexcept
{
return cb;
}
inline const_buffer buffer(const const_buffer& cb, size_t n) noexcept
constexpr const_buffer buffer(const const_buffer& cb, size_t n) noexcept
{
return const_buffer(cb.data(), (std::min)(cb.size(), n));
}