diff --git a/include/picojson.h b/include/picojson.h index 24a60c5b..bb554d7f 100644 --- a/include/picojson.h +++ b/include/picojson.h @@ -194,8 +194,8 @@ class value { private: template value(const T *); // intentionally defined to block implicit conversion of pointer to bool template static void _indent(Iter os, int indent); - template void _serialize(Iter os, int indent) const; - std::string _serialize(int indent) const; + template void serialize_(Iter os, int indent) const; + std::string serialize_(int indent) const; void clear(); }; @@ -557,11 +557,11 @@ template void serialize_str(const std::string &s, Iter oi) { } template void value::serialize(Iter oi, bool prettify) const { - return _serialize(oi, prettify ? 0 : -1); + return serialize_(oi, prettify ? 0 : -1); } inline std::string value::serialize(bool prettify) const { - return _serialize(prettify ? 0 : -1); + return serialize_(prettify ? 0 : -1); } template void value::_indent(Iter oi, int indent) { @@ -571,7 +571,7 @@ template void value::_indent(Iter oi, int indent) { } } -template void value::_serialize(Iter oi, int indent) const { +template void value::serialize_(Iter oi, int indent) const { switch (type_) { case string_type: serialize_str(*u_.string_, oi); @@ -588,7 +588,7 @@ template void value::_serialize(Iter oi, int indent) const { if (indent != -1) { _indent(oi, indent); } - i->_serialize(oi, indent); + i->serialize_(oi, indent); } if (indent != -1) { --indent; @@ -616,7 +616,7 @@ template void value::_serialize(Iter oi, int indent) const { if (indent != -1) { *oi++ = ' '; } - i->second._serialize(oi, indent); + i->second.serialize_(oi, indent); } if (indent != -1) { --indent; @@ -636,9 +636,9 @@ template void value::_serialize(Iter oi, int indent) const { } } -inline std::string value::_serialize(int indent) const { +inline std::string value::serialize_(int indent) const { std::string s; - _serialize(std::back_inserter(s), indent); + serialize_(std::back_inserter(s), indent); return s; }