commit fe3979cd8a94c4a23994171a6e48c6905cef05b5
author Christopher Dunn <cdunn2001@gmail.com> Sat Jan 24 13:54:28 2015 -0600
committer Christopher Dunn <cdunn2001@gmail.com> Sun Jan 25 15:54:40 2015 -0600
tree 0a2e9000a1b3ecbcbafc96371ee72778c61acf8d
parent 94665eab72c482c5622d8c9d89af62fc1e072f96

drop StreamWriterBuilderFactory, for now

src/jsontestrunner/main.cpp

diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
index 61411b4..28894ce 100644
--- a/src/jsontestrunner/main.cpp
+++ b/src/jsontestrunner/main.cpp
@@ -184,8 +184,7 @@
 static std::string useBuiltStyledStreamWriter(
     Json::Value const& root)
 {
-  Json::StreamWriterBuilderFactory f;
-  Json::StreamWriter::Builder builder(&f);
+  Json::StreamWriter::Builder builder;
   builder.setCommentStyle(Json::StreamWriter::CommentStyle::All);
   return writeString(root, builder);
 }

src/lib_json/json_writer.cpp

diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
index b6127d3..a3fa50d 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -967,6 +967,13 @@
 {
   return new BuiltStyledStreamWriter(stream, indentation_, cs_);
 }
+
+// This might become public someday.
+class StreamWriterBuilderFactory {
+public:
+  virtual ~StreamWriterBuilderFactory();
+  virtual StreamWriterBuilder* newStreamWriterBuilder() const;
+};
 StreamWriterBuilderFactory::~StreamWriterBuilderFactory()
 {
 }
@@ -975,14 +982,19 @@
   return new StreamWriterBuilder;
 }
 
-StreamWriter::Builder::Builder(StreamWriterBuilderFactory const* f)
-    : own_(f->newStreamWriterBuilder())
+StreamWriter::Builder::Builder()
+    : own_(StreamWriterBuilderFactory().newStreamWriterBuilder())
 {
 }
 StreamWriter::Builder::~Builder()
 {
   delete own_;
 }
+StreamWriter::Builder::Builder(Builder const&)
+  : own_(nullptr)
+{abort();}
+void StreamWriter::Builder::operator=(Builder const&)
+{abort();}
 void StreamWriter::Builder::setCommentStyle(CommentStyle v)
 {
   own_->setCommentStyle(v);
@@ -1006,8 +1018,7 @@
 }
 
 std::ostream& operator<<(std::ostream& sout, Value const& root) {
-  StreamWriterBuilderFactory f;
-  StreamWriter::Builder builder(&f);
+  StreamWriter::Builder builder;
   builder.setCommentStyle(StreamWriter::CommentStyle::All);
   std::shared_ptr<StreamWriter> writer(builder.newStreamWriter(&sout));
   writer->write(root);