From 1a5a1708b77bc37b779fcef22c23c77616b46f1d Mon Sep 17 00:00:00 2001 From: Nicholas Hutchinson Date: Wed, 23 Dec 2015 15:59:13 +1300 Subject: [PATCH] Add fprintf overload that writes to a std::ostream For completeness, add an overload for printf that takes a std::ostream. --- format.cc | 7 +++++++ format.h | 12 ++++++++++++ test/printf-test.cc | 7 +++++++ 3 files changed, 26 insertions(+) diff --git a/format.cc b/format.cc index 1970d53c..dc0b7f37 100644 --- a/format.cc +++ b/format.cc @@ -882,6 +882,13 @@ FMT_FUNC int fmt::fprintf(std::FILE *f, CStringRef format, ArgList args) { return std::fwrite(w.data(), 1, size, f) < size ? -1 : static_cast(size); } +FMT_FUNC int fmt::fprintf(std::ostream &os, CStringRef format, ArgList args) { + MemoryWriter w; + printf(w, format, args); + os.write(w.data(), w.size()); + return static_cast(w.size()); +} + #ifndef FMT_HEADER_ONLY template struct fmt::internal::BasicData; diff --git a/format.h b/format.h index a9fdfdbd..42bb0379 100644 --- a/format.h +++ b/format.h @@ -3366,6 +3366,18 @@ FMT_VARIADIC(int, fprintf, std::FILE *, CStringRef) */ FMT_API void print(std::ostream &os, CStringRef format_str, ArgList args); FMT_VARIADIC(void, print, std::ostream &, CStringRef) + +/** + \rst + Prints formatted data to the stream *os*. + + **Example**:: + + fprintf(cerr, "Don't %s!", "panic"); + \endrst + */ +FMT_API int fprintf(std::ostream &os, CStringRef format_str, ArgList args); +FMT_VARIADIC(int, fprintf, std::ostream &, CStringRef) #endif namespace internal { diff --git a/test/printf-test.cc b/test/printf-test.cc index 4c35edb0..f7bf375b 100644 --- a/test/printf-test.cc +++ b/test/printf-test.cc @@ -476,3 +476,10 @@ TEST(PrintfTest, PrintfError) { TEST(PrintfTest, WideString) { EXPECT_EQ(L"abc", fmt::sprintf(L"%s", TestWString(L"abc"))); } + +TEST(PrintfTest, Iostream) { + std::ostringstream os; + int ret = fmt::fprintf(os, "Don't %s!", "panic"); + EXPECT_EQ("Don't panic!", os.str()); + EXPECT_EQ(12, ret); +}