amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-03-01 06:46:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,022 Commits 25 Branches 57 Tags
72afe53fa0f717b65bf62d81c2e2f409d1cfa3ad
Commit Graph

2022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann
72afe53fa0 📝 updated documentation for update() function #661 2017-08-15 21:42:50 +02:00
Niels Lohmann
039e2f03bc Merge branch 'develop' into feature/update 2017-08-15 19:54:22 +02:00
Niels Lohmann
7f4722a75d Merge branch 'feature/travis_clang' into develop 2017-08-15 19:52:47 +02:00
Niels Lohmann
08805f7f14 🔨 cleanup 2017-08-13 20:57:27 +02:00
Niels Lohmann
988077e046 Merge branch 'develop' into feature/travis_clang 2017-08-13 20:27:27 +02:00
Niels Lohmann
7d19aed567 🔨 cleanup 2017-08-13 19:02:58 +02:00
Niels Lohmann
569c00eb18 👷 changed c++17 to c++1z 2017-08-10 23:41:12 +02:00
Niels Lohmann
6151b056eb 🔨 cleanup 2017-08-10 23:40:30 +02:00
Niels Lohmann
bade3b3e6c 👷 cleanup 2017-08-10 21:17:40 +02:00
Niels Lohmann
76b195d7d1 👷 fix for coverity + clang-5.0 2017-08-10 20:54:59 +02:00
Niels Lohmann
cd34358e7c 👷 removing clang from source 2017-08-10 20:37:23 +02:00
Niels Lohmann
5eb9f5fd4f 👷 clang-3.4 2017-08-10 20:31:59 +02:00
Niels Lohmann
f49356e703 👷 clang-3.4 2017-08-10 20:26:49 +02:00
Niels Lohmann
e0f8eb1710 👷 clang-4.0 2017-08-10 20:21:41 +02:00
Niels Lohmann
6dc89e47fc 👷 clang-3.9 2017-08-10 20:16:35 +02:00
Niels Lohmann
8de710bbe7 👷 added source for gcc 2017-08-10 20:12:27 +02:00
Niels Lohmann
195d773bc5 👷 added gcc 2017-08-10 20:09:39 +02:00
Niels Lohmann
e7f2d2646a 👷 removed gcc 2017-08-10 20:06:47 +02:00
Niels Lohmann
6b20f6d1ef 👷 clang-3.8 2017-08-10 20:04:36 +02:00
Niels Lohmann
82cd8c8d02 👷 another try 2017-08-10 19:59:00 +02:00
Niels Lohmann
f256587c4f 👷 clang-3.4 2017-08-10 19:56:09 +02:00
Niels Lohmann
c06b5c5c10 👷 clang-3.5 2017-08-10 19:50:36 +02:00
Niels Lohmann
3283352db3 👷 using clang++ 2017-08-10 19:45:33 +02:00
Niels Lohmann
c20dd7522f 👷 another try 2017-08-10 19:40:09 +02:00
Niels Lohmann
94dfecd487 👷 removed g++ 2017-08-10 19:31:43 +02:00
Niels Lohmann
8963aae57d 👷 clang-3.6 2017-08-10 19:24:36 +02:00
Niels Lohmann
5aceb0e029 👷 clang-3.6 2017-08-10 19:23:55 +02:00
Niels Lohmann
e7a7e4f81f 👷 fixed compiler 2017-08-10 19:18:45 +02:00
Niels Lohmann
e333562633 👷 different source 2017-08-10 19:15:16 +02:00
Niels Lohmann
eb6de822bb 👷 clang-3.7 2017-08-10 19:12:04 +02:00
Niels Lohmann
c1642affaa 👷 clang-3.8 2017-08-10 19:03:35 +02:00
Niels Lohmann
a46afd4008 Merge pull request #679 from traits/patch-1 
Digraph warning
 2017-08-10 11:39:13 +02:00
traits
54c67dcfec Update json.hpp 2017-08-10 09:05:00 +02:00
Niels Lohmann
99ea12f304 📝 acknowledgements for #674, #678, #682, #685, and #686 2017-08-10 06:50:34 +02:00
Niels Lohmann
d26b3f1fe5 Merge pull request #686 from WebProdPP/patch-1 
Update json.hpp
 2017-08-10 06:44:59 +02:00
Niels Lohmann
345846b514 Merge pull request #685 from daixtrose/patch-1 
Remove duplicate word
 2017-08-09 15:32:33 +02:00
WebProdPP
c9509ccf97 Update json.hpp 
mistake
 2017-08-09 16:13:43 +03:00
Markus Werle
86b3d06a93 remove duplicate word 
s/to to/to/
 2017-08-09 11:56:48 +02:00
Niels Lohmann
6e5b895f87 Merge pull request #682 from kbthomp1/fix-intel-osx 
To fix compilation issue for intel OSX compiler
 2017-08-09 10:16:03 +02:00
Kyle Thompson
4b55f0ebd6 To fix compilation issue for intel OSX compiler 
o To prevent the compilation issue on OSX with the intel compiler suite.  The
error was found with icpc version 15.0.3.187 where the "__clang_version__" was
not defined correctly, while "__clang__" was.
 2017-08-08 18:43:03 -04:00
Niels Lohmann
c90bf5e0f1 👷 removed failing builders 2017-08-08 21:26:15 +02:00
Niels Lohmann
dd008545d1 Merge branch 'develop' of https://github.com/nlohmann/json into develop 2017-08-08 19:15:49 +02:00
Niels Lohmann
054b0250be 👷 trying to install g++ to make clang work 2017-08-08 19:14:22 +02:00
traits
ab44a50d98 Digraph warning 
The original version can trigger a digraph-related warning in VS2015. Is this namespace construct a typo or something deliberate?
 2017-08-07 14:23:48 +02:00
Niels Lohmann
b32a6b8c75 Merge pull request #678 from DmitryKuk/develop 
massage -> message
 2017-08-05 13:42:43 +02:00
DmitryKuk
19437c15de massage -> message 2017-08-05 10:43:08 +03:00
Niels Lohmann
e523312fa2 ✅ improved test coverage 2017-08-03 17:47:42 +02:00
Niels Lohmann
d2c3592908 ✅ added test cases for update #661 2017-08-02 22:44:58 +02:00
Niels Lohmann
d1e13d5128 🎉 first draft for #661 2017-08-02 22:12:41 +02:00
Niels Lohmann
0ea0d7d860 Merge pull request #674 from wincent/patch-1 
Fix "not constraint" grammar in docs
 2017-08-01 20:21:04 +02:00