From 9636fe20c5e2eda44b65d29c7b59f2cb69a5b47a Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 28 Aug 2015 20:45:06 +0100 Subject: Migrate formatted string wrappers as macros into buffer.h --- libadhocutil/buffer.h | 5 +++++ libadhocutil/unittests/testBuffer.cpp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/libadhocutil/buffer.h b/libadhocutil/buffer.h index aa1560a..ff1e250 100644 --- a/libadhocutil/buffer.h +++ b/libadhocutil/buffer.h @@ -117,5 +117,10 @@ class DLL_PUBLIC Buffer : public virtual IntrusivePtrBase { }; Buffer::FragmentBase::~FragmentBase() = default; +// libmisc compat macros +#define vstringf Buffer().vappendf +#define stringf Buffer().appendf +#define stringbf Buffer().appendbf + #endif diff --git a/libadhocutil/unittests/testBuffer.cpp b/libadhocutil/unittests/testBuffer.cpp index 9c1c956..dce9f66 100644 --- a/libadhocutil/unittests/testBuffer.cpp +++ b/libadhocutil/unittests/testBuffer.cpp @@ -115,5 +115,10 @@ BOOST_AUTO_TEST_CASE( replacesstringbf ) { auto str = Buffer().appendbf("something %d", 1234).str(); BOOST_REQUIRE_EQUAL("something 1234", str); + + std::string macrostringf = stringf("something %d", 1234); + BOOST_REQUIRE_EQUAL("something 1234", macrostringf); + std::string macrostringbf = stringbf("something %d", 1234); + BOOST_REQUIRE_EQUAL("something 1234", macrostringbf); } -- cgit v1.2.3