Problem: Sending string literals is awkward

Solution: A function str_buffer specifically for
creating buffers for null terminated string literals.

Author: gummif

tests/buffer.cpp

@@ -236,6 +236,20 @@ TEST_CASE("const_buffer creation string_view", "[buffer]")
 }
 #endif
 
+TEST_CASE("const_buffer creation with str_buffer", "[buffer]")
+{
+    const wchar_t wd[10] = {};
+    zmq::const_buffer b = zmq::str_buffer(wd);
+    CHECK(b.size() == 9 * sizeof(wchar_t));
+    CHECK(b.data() == static_cast<const wchar_t*>(wd));
+
+    zmq::const_buffer b2_null = zmq::buffer("hello");
+    zmq::const_buffer b2 = zmq::str_buffer("hello");
+    CHECK(b2_null.size() == 6);
+    CHECK(b2.size() == 5);
+    CHECK(std::string(static_cast<const char*>(b2.data()), b2.size()) == "hello");
+}
+
 TEST_CASE("buffer of structs", "[buffer]")
 {
     struct some_pod

zmq.hpp

@@ -1110,6 +1110,19 @@ const_buffer buffer(std::basic_string_view<T, Traits> data, size_t n_bytes) noex
 }
 #endif
 
+// Buffer for a string literal (null terminated)
+// where the buffer size excludes the terminating character.
+// Equivalent to zmq::buffer(std::string_view("...")).
+template<class Char, size_t N>
+const_buffer str_buffer(const Char (&data)[N]) noexcept
+{
+    static_assert(detail::is_pod_like<Char>::value, "Char must be POD");
+    static_assert(N > 0, "N > 0");
+    assert(data[N - 1] == Char{0});
+    return const_buffer(N == 1 ? nullptr : static_cast<const Char*>(data), 
+                        (N - 1) * sizeof(Char));
+}
+
 #endif // ZMQ_CPP11
 
 namespace detail