diff options
| -rw-r--r-- | base/json_writer.cc | 4 | ||||
| -rw-r--r-- | base/json_writer.h | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/base/json_writer.cc b/base/json_writer.cc index 512e0a1..0a1b8bb 100644 --- a/base/json_writer.cc +++ b/base/json_writer.cc @@ -49,8 +49,8 @@ void JSONWriter::Write(const Value* const node, bool pretty_print, } JSONWriter::JSONWriter(bool pretty_print, std::string* json) - : pretty_print_(pretty_print), - json_string_(json) { + : json_string_(json), + pretty_print_(pretty_print) { DCHECK(json); } diff --git a/base/json_writer.h b/base/json_writer.h index 9f8f8d3..38255f3 100644 --- a/base/json_writer.h +++ b/base/json_writer.h @@ -27,8 +27,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef CHROME_COMMON_JSON_WRITER_H__ -#define CHROME_COMMON_JSON_WRITER_H__ +#ifndef BASE_JSON_WRITER_H_ +#define BASE_JSON_WRITER_H_ #include <string> @@ -50,7 +50,6 @@ class JSONWriter { private: JSONWriter(bool pretty_print, std::string* json); - DISALLOW_EVIL_CONSTRUCTORS(JSONWriter); // Called recursively to build the JSON string. Whe completed, value is // json_string_ will contain the JSON. @@ -66,6 +65,8 @@ class JSONWriter { std::string* json_string_; bool pretty_print_; + + DISALLOW_COPY_AND_ASSIGN(JSONWriter); }; -#endif // CHROME_COMMON_JSON_WRITER_H__ +#endif // BASE_JSON_WRITER_H_ |