From dbee5f968c57e58caec7b45ef5077117f994bad9 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Thu, 29 Jan 2015 11:49:37 -0600 Subject: [PATCH] Revert "added option to FastWriter which omits the trailing new line character" This reverts commit 5bf16105b5a90f9fa7d5d4d43452feee46603a52. --- include/json/writer.h | 3 --- src/lib_json/json_writer.cpp | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/json/writer.h b/include/json/writer.h index 2d6dbce..541c0ce 100644 --- a/include/json/writer.h +++ b/include/json/writer.h @@ -164,8 +164,6 @@ public: */ void dropNullPlaceholders(); - void omitEndingLineFeed(); - public: // overridden from Writer virtual std::string write(const Value& root); @@ -175,7 +173,6 @@ private: std::string document_; bool yamlCompatiblityEnabled_; bool dropNullPlaceholders_; - bool omitEndingLineFeed_; }; /** \brief Writes a Value in JSON format in a diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index 69323df..ec68d31 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -280,20 +280,16 @@ Writer::~Writer() {} // ////////////////////////////////////////////////////////////////// FastWriter::FastWriter() - : yamlCompatiblityEnabled_(false), dropNullPlaceholders_(false), - omitEndingLineFeed_(false) {} + : yamlCompatiblityEnabled_(false), dropNullPlaceholders_(false) {} void FastWriter::enableYAMLCompatibility() { yamlCompatiblityEnabled_ = true; } void FastWriter::dropNullPlaceholders() { dropNullPlaceholders_ = true; } -void FastWriter::omitEndingLineFeed() { omitEndingLineFeed_ = true; } - std::string FastWriter::write(const Value& root) { document_ = ""; writeValue(root); - if (!omitEndingLineFeed_) - document_ += "\n"; + document_ += "\n"; return document_; }