Merge pull request #61 from d-frey/master

Update taocpp/json to 1.0.0-beta.3
miloyip · Sep 8, 2016 · cb0a641 · cb0a641
2 parents 1f18db7 + 6392558
commit cb0a641
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ Library | Language | Version | Notes
 [SimpleJSON](https://github.com/MJPA/SimpleJSON) | C++ | 
 [sheredom/json.h](https://github.com/sheredom/json.h) | C | | Not parsing number per se, so do it as post-process.
 udp/json | C | 1.1.0 | Actually 2 libraries: [udp/json-parser](https://github.com/udp/json-parser) & [udp/json-builder](https://github.com/udp/json-builder).
-[taocpp/json](https://github.com/taocpp/json) | C++11 | 1.0.0-beta.2 | Uses [PEGTL](https://github.com/ColinH/PEGTL) for parsing
+[taocpp/json](https://github.com/taocpp/json) | C++11 | 1.0.0-beta.3 | Uses [PEGTL](https://github.com/ColinH/PEGTL) for parsing
 [tunnuz/JSON++](https://github.com/tunnuz/json) | C++ |
 [ujson](https://bitbucket.org/awangk/ujson/) | C++ | 2015-04-12 |
 [ujson4c](https://github.com/esnme/ujson4c) | C | 

diff --git a/src/tests/taocppjson.cpp b/src/tests/taocppjson.cpp
@@ -115,7 +115,7 @@ class TAOCPPJSONTest : public TestBase {
    virtual bool ParseDouble(const char* j, double* d) const {
       try {
          auto root = tao::json::from_string(j);
-         *d = root.at(0).get_double();
+         *d = root[0].get_double();
          return true;
       }
       catch (...) {
@@ -126,7 +126,7 @@ class TAOCPPJSONTest : public TestBase {
    virtual bool ParseString(const char* j, std::string& s) const {
       try {
          auto root = tao::json::from_string(j);
-         s = root.at(0).get_string();
+         s = root[0].get_string();
          return true;
       }
       catch (...) {

diff --git a/thirdparty/taocppjson b/thirdparty/taocppjson
+3 −3		README.md
+5 −0		include/tao/json.hh
+159 −0		include/tao/json/comparison_operators.hh
+12 −18		include/tao/json/from_string.hh
+0 −66		include/tao/json/internal/escape.hh
+78 −9		include/tao/json/internal/to_stream.hh
+94 −0		include/tao/json/internal/totally_ordered.hh
+2 −2		include/tao/json/internal/value_action.hh
+0 −9		include/tao/json/object_operators.hh
+7 −7		include/tao/json/patch.hh
+39 −27		include/tao/json/pointer.hh
+15 −15		include/tao/json/traits.hh
+14 −3		include/tao/json/type.hh
+47 −164		include/tao/json/value.hh
+458 −15		src/test/json/compare.cc
+39 −1		src/test/json/create.cc
+19 −0		src/test/json/escape.cc
+65 −0		src/test/json/index.cc
+119 −0		src/test/json/integer.cc
+128 −3		src/test/json/json_patch.cc
+46 −0		src/test/json/json_pointer.cc
+40 −0		src/test/json/object_operators.cc
+13 −2		src/test/json/ostream.cc
+5 −1		src/test/json/parse.cc
+36 −3		src/test/json/self_contained.cc
+44 −17		src/test/json/test_assert.hh