updated README

This commit is contained in:
Niels 2015-01-12 23:38:55 +01:00
parent dcf71748a6
commit d47b0e749b
2 changed files with 4 additions and 3 deletions

View file

@ -260,9 +260,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
I deeply appreciate the help of the following people. I deeply appreciate the help of the following people.
- [Teemperor](https://github.com/Teemperor) implemented CMake support and lcov integration and realized escape handling in the string parser. - [Teemperor](https://github.com/Teemperor) implemented CMake support and lcov integration, realized escape and Unicode handling in the string parser, and fixed the JSON serialization.
- [elliotgoodrich](https://github.com/elliotgoodrich) fixed an issue with double deletion in the iterator classes. - [elliotgoodrich](https://github.com/elliotgoodrich) fixed an issue with double deletion in the iterator classes.
- [kirkshoop](https://github.com/kirkshoop) made the iterators of the class composable to other libraries. - [kirkshoop](https://github.com/kirkshoop) made the iterators of the class composable to other libraries.
- [wancw](https://github.com/wanwc) fixed a bug that hindered the class to compile with Clang.
Thanks a lot for helping out! Thanks a lot for helping out!

View file

@ -175,7 +175,7 @@ class json
T get() const; T get() const;
/// implicit conversion to string representation /// implicit conversion to string representation
operator const std::string() const; operator std::string() const;
/// implicit conversion to integer (only for numbers) /// implicit conversion to integer (only for numbers)
operator int() const; operator int() const;
/// implicit conversion to double (only for numbers) /// implicit conversion to double (only for numbers)
@ -894,7 +894,7 @@ json::object_t json::get() const
} }
} }
json::operator const std::string() const json::operator std::string() const
{ {
return get<std::string>(); return get<std::string>();
} }