renamed "toString()" to "to_string()"

This commit is contained in:
Niels committed 2015-01-04 20:50:28 +01:00
1 parent f63ff7727e
commit 3bef1a5097
4 files changed
+14 -14

No files matched your search

+1 -1
View File
@@ -116,7 +116,7 @@ You can also get a string representation (serialize):
```cpp ```cpp
// explicit conversion to string // explicit conversion to string
std::string s = j.toString(); std::string s = j.to_string();
``` ```
The value of s could be `{"pi": 3.141, "happy": true}`, but the order of the entries in the object is not fixed. The value of s could be `{"pi": 3.141, "happy": true}`, but the order of the entries in the object is not fixed.
+3 -3
View File
@@ -477,7 +477,7 @@ json::operator object_t() const
return get<object_t>(); return get<object_t>();
} }
const std::string json::toString() const noexcept const std::string json::to_string() const noexcept
{ {
switch (_type) switch (_type)
{ {
@@ -511,7 +511,7 @@ const std::string json::toString() const noexcept
{ {
result += ", "; result += ", ";
} }
result += i->toString(); result += i->to_string();
} }
return "[" + result + "]"; return "[" + result + "]";
@@ -527,7 +527,7 @@ const std::string json::toString() const noexcept
{ {
result += ", "; result += ", ";
} }
result += "\"" + i->first + "\": " + i->second.toString(); result += "\"" + i->first + "\": " + i->second.to_string();
} }
return "{" + result + "}"; return "{" + result + "}";
+3 -3
View File
@@ -181,13 +181,13 @@ class json
/// write to stream /// write to stream
friend std::ostream& operator<<(std::ostream& o, const json& j) friend std::ostream& operator<<(std::ostream& o, const json& j)
{ {
o << j.toString(); o << j.to_string();
return o; return o;
} }
/// write to stream /// write to stream
friend std::ostream& operator>>(const json& j, std::ostream& o) friend std::ostream& operator>>(const json& j, std::ostream& o)
{ {
o << j.toString(); o << j.to_string();
return o; return o;
} }
@@ -205,7 +205,7 @@ class json
} }
/// explicit conversion to string representation (C++ style) /// explicit conversion to string representation (C++ style)
const std::string toString() const noexcept; const std::string to_string() const noexcept;
/// add an object/array to an array /// add an object/array to an array
json& operator+=(const json&); json& operator+=(const json&);
+7 -7
View File
@@ -15,7 +15,7 @@ TEST_CASE("array")
const json j_const (j); const json j_const (j);
// string representation of default value // string representation of default value
CHECK(j.toString() == "[]"); CHECK(j.to_string() == "[]");
// iterators // iterators
CHECK(j.begin() != j.end()); CHECK(j.begin() != j.end());
@@ -303,7 +303,7 @@ TEST_CASE("object")
const json j_const = j; const json j_const = j;
// string representation of default value // string representation of default value
CHECK(j.toString() == "{}"); CHECK(j.to_string() == "{}");
// iterators // iterators
CHECK(j.begin() != j.end()); CHECK(j.begin() != j.end());
@@ -683,7 +683,7 @@ TEST_CASE("null")
CHECK(j.type() == json::value_type::null); CHECK(j.type() == json::value_type::null);
// string representation of default value // string representation of default value
CHECK(j.toString() == "null"); CHECK(j.to_string() == "null");
// iterators // iterators
CHECK(j.begin() != j.end()); CHECK(j.begin() != j.end());
@@ -753,7 +753,7 @@ TEST_CASE("string")
CHECK(j.cbegin() != j.cend()); CHECK(j.cbegin() != j.cend());
// string representation of default value // string representation of default value
CHECK(j.toString() == "\"\""); CHECK(j.to_string() == "\"\"");
// container members // container members
CHECK(j.size() == 1); CHECK(j.size() == 1);
@@ -835,7 +835,7 @@ TEST_CASE("boolean")
CHECK(j.cbegin() != j.cend()); CHECK(j.cbegin() != j.cend());
// string representation of default value // string representation of default value
CHECK(j.toString() == "false"); CHECK(j.to_string() == "false");
// container members // container members
CHECK(j.size() == 1); CHECK(j.size() == 1);
@@ -914,7 +914,7 @@ TEST_CASE("number (int)")
CHECK(j.cbegin() != j.cend()); CHECK(j.cbegin() != j.cend());
// string representation of default value // string representation of default value
CHECK(j.toString() == "0"); CHECK(j.to_string() == "0");
// container members // container members
CHECK(j.size() == 1); CHECK(j.size() == 1);
@@ -1000,7 +1000,7 @@ TEST_CASE("number (float)")
CHECK(j.cbegin() != j.cend()); CHECK(j.cbegin() != j.cend());
// string representation of default value // string representation of default value
CHECK(j.toString() == "0.000000"); CHECK(j.to_string() == "0.000000");
// container members // container members
CHECK(j.size() == 1); CHECK(j.size() == 1);