Merge branch 'master' of github.com:jgaa/restc-cpp

jgaa · Apr 11, 2016 · 88f4647 · 88f4647
2 parents 935652f + 0274e1b
commit 88f4647
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -167,6 +167,7 @@ REST requests.
  - [x] ~~Deserialization: std::vector of json native datatypes and classes~~
  - [x] ~~Serialization of the above~~
  - [ ] Serialization / Deserialization: std::map
+ - [ ] Serialization / Deserialization: std::deque
 - [ ] Unit tests
  - [x] ~~Url parser~~
  - [x] ~~Json / C++ transformation~~
@@ -180,7 +181,7 @@ REST requests.
  - [ ] General support In HTTP Requests module
  - [ ] Async from json Serialization
 - [ ] Handle redirects
-- [ ] Implement simple File Upload (as body)
+- [x] ~~Implement simple File Upload (as body)~~
 - [ ] Implement simple File Download (from body)
 - [ ] Verify that it compiles with Debian Stable
 - [ ] Verify that it compiles with Windows 10 / Visual Studio

diff --git a/externals/rapidjson b/externals/rapidjson