fix DelimWriter constructor over a filename

cherry pick and modify: /vincentlaucsb/csv-parser/pull/vincentlaucsb#251
hirohira9119 · Oct 23, 2024 · f871e72 · f871e72
1 parent e24d625
commit f871e72
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/include/internal/csv_writer.hpp b/include/internal/csv_writer.hpp
@@ -5,6 +5,7 @@
 #pragma once
 #include <fstream>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <tuple>
 #include <type_traits>
@@ -205,7 +206,11 @@ namespace csv {
          *
          *  @param[out] filename  File to write to
          */
-        DelimWriter(const std::string& filename) : DelimWriter(std::ifstream(filename)) {};
+        DelimWriter(const std::string& filename) 
+            : inner_os(new std::ofstream(filename)) 
+            , out(*inner_os)
+            , quote_minimal(true)
+            {}
 
         /** Destructor will flush remaining data
          *
@@ -360,6 +365,7 @@ namespace csv {
             IF_CONSTEXPR(Flush) out.flush();
         }
 
+        std::unique_ptr<std::ofstream> inner_os;
         OutputStream & out;
         bool quote_minimal;
     };

diff --git a/single_include/csv.hpp b/single_include/csv.hpp
@@ -6524,6 +6524,7 @@ namespace csv {
 
 #include <fstream>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <tuple>
 #include <type_traits>
@@ -6722,7 +6723,11 @@ namespace csv {
          *
          *  @param[out] filename  File to write to
          */
-        DelimWriter(const std::string& filename) : DelimWriter(std::ifstream(filename)) {};
+        DelimWriter(const std::string& filename) 
+            : inner_os(new std::ofstream(filename)) 
+            , out(*inner_os)
+            , quote_minimal(true)
+            {}
 
         /** Destructor will flush remaining data
          *
@@ -6877,6 +6882,7 @@ namespace csv {
             IF_CONSTEXPR(Flush) out.flush();
         }
 
+        std::unique_ptr<std::ofstream> inner_os;
         OutputStream & out;
         bool quote_minimal;
     };

diff --git a/single_include_test/csv.hpp b/single_include_test/csv.hpp
@@ -6524,6 +6524,7 @@ namespace csv {
 
 #include <fstream>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <tuple>
 #include <type_traits>
@@ -6722,7 +6723,11 @@ namespace csv {
          *
          *  @param[out] filename  File to write to
          */
-        DelimWriter(const std::string& filename) : DelimWriter(std::ifstream(filename)) {};
+        DelimWriter(const std::string& filename) 
+            : inner_os(new std::ofstream(filename)) 
+            , out(*inner_os)
+            , quote_minimal(true)
+            {}
 
         /** Destructor will flush remaining data
          *
@@ -6877,6 +6882,7 @@ namespace csv {
             IF_CONSTEXPR(Flush) out.flush();
         }
 
+        std::unique_ptr<std::ofstream> inner_os;
         OutputStream & out;
         bool quote_minimal;
     };