fmt::ostream - aggregate buffer instead of inheriting it

include/fmt/os.h

@@ -379,56 +379,76 @@ struct ostream_params {
 #  endif
 };
 
-FMT_END_DETAIL_NAMESPACE
-
-// Added {} below to work around default constructor error known to
-// occur in Xcode versions 7.2.1 and 8.2.1.
-constexpr detail::buffer_size buffer_size{};
-
-/** A fast output stream which is not thread-safe. */
-class FMT_API ostream final : private detail::buffer<char> {
- private:
+template <typename Char> class file_buffer final : public detail::buffer<Char> {
   file file_;
 
-  void grow(size_t) override;
-
-  ostream(cstring_view path, const detail::ostream_params& params)
-      : file_(path, params.oflag) {
-    set(new char[params.buffer_size], params.buffer_size);
+  void grow(size_t) override {
+    if (this->size() == this->capacity()) flush();
   }
 
  public:
-  ostream(ostream&& other)
-      : detail::buffer<char>(other.data(), other.size(), other.capacity()),
+  file_buffer(cstring_view path, const detail::ostream_params& params)
+      : file_(path, params.oflag) {
+    detail::buffer<Char>::set(new Char[params.buffer_size], params.buffer_size);
+  }
+  file_buffer(file_buffer&& other)
+      : detail::buffer<Char>(other.data(), other.size(), other.capacity()),
         file_(std::move(other.file_)) {
     other.clear();
     other.set(nullptr, 0);
   }
-  ~ostream() {
+  ~file_buffer() {
     flush();
-    delete[] data();
+    delete[] detail::buffer<Char>::data();
   }
 
   void flush() {
-    if (size() == 0) return;
-    file_.write(data(), size());
-    clear();
+    if (detail::buffer<Char>::size() == 0) return;
+    file_.write(
+        detail::buffer<Char>::data(),
+        detail::buffer<Char>::size() * sizeof(detail::buffer<Char>::data()[0]));
+    detail::buffer<Char>::clear();
   }
 
-  template <typename... T>
-  friend ostream output_file(cstring_view path, T... params);
-
   void close() {
     flush();
     file_.close();
   }
+};
+
+FMT_END_DETAIL_NAMESPACE
+
+// Added {} below to work around default constructor error known to
+// occur in Xcode versions 7.2.1 and 8.2.1.
+constexpr detail::buffer_size buffer_size{};
+
+/** A fast output stream which is not thread-safe. */
+class FMT_API ostream final {
+ private:
+  FMT_MSC_WARNING(suppress : 4251)
+  detail::file_buffer<char> buffer_;
+
+  ostream(cstring_view path, const detail::ostream_params& params)
+      : buffer_(path, params) {}
+
+ public:
+  ostream(ostream&& other) : buffer_(std::move(other.buffer_)) {}
+
+  ~ostream();
+
+  void flush() { buffer_.flush(); }
+
+  template <typename... T>
+  friend ostream output_file(cstring_view path, T... params);
+
+  void close() { buffer_.close(); }
 
   /**
     Formats ``args`` according to specifications in ``fmt`` and writes the
     output to the file.
    */
   template <typename... T> void print(format_string<T...> fmt, T&&... args) {
-    vformat_to(detail::buffer_appender<char>(*this), fmt,
+    vformat_to(detail::buffer_appender<char>(buffer_), fmt,
                fmt::make_format_args(args...));
   }
 };

src/os.cc

@@ -366,8 +366,6 @@ long getpagesize() {
 #  endif
 }
 
-FMT_API void ostream::grow(size_t) {
-  if (this->size() == this->capacity()) flush();
-}
+ostream::~ostream() = default;
 #endif  // FMT_USE_FCNTL
 FMT_END_NAMESPACE