haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
710 Commits
16 Branches
56 Tags
222 MiB
Commit Graph

26 Commits (91c58a77a1b5d2a9d87c12aa3127bc348237fedd)

Author SHA1 Message Date
Niels 5bc1b65676 clean up (for #154) 2015-12-14 16:58:49 +01:00
Niels 258f04c561 fixed #154 (no more warnings for incomplete switches) 2015-12-14 16:32:37 +01:00
Niels bb0d01e597 better compiler matrix 2015-08-21 19:05:47 +02:00
Niels c85dbef98f more documentation 2015-06-21 22:42:32 +02:00
Niels 91c330ae01 reorganized repo 2015-06-21 21:24:03 +02:00
Niels 4bb5126502 more documentation 2015-06-21 18:30:08 +02:00
Niels d972483b33 overworked documentation configuration 2015-06-21 13:39:10 +02:00
Niels f6040ea3bc minor change 2015-06-21 13:16:52 +02:00
Niels e0fa56f84f clean up 2015-06-21 13:14:39 +02:00
Niels 332b10998a clean up 2015-06-21 13:12:17 +02:00
Niels 022c11bf86 broke Makefile 2015-06-21 12:48:18 +02:00
Niels d200abfb5f automatic commit 2015-06-21 12:47:35 +02:00
Niels e289eada49 added target to update Doxygen 2015-06-21 12:45:46 +02:00
Niels c40e85920f more documentation 2015-06-21 09:44:12 +02:00
Niels bb13c931b3 more documentation 2015-06-21 02:14:01 +02:00
Niels e63c508172 overworked doxygen 2015-06-21 00:59:33 +02:00
Niels 9dbb4402fb improved performance for dump() 2015-06-03 23:34:10 +02:00
Niels cb873a42ed added Benchpress benchmarks 2015-06-02 23:57:45 +02:00
Niels 1068ad106b fixed Makefile 2015-04-27 22:35:45 +02:00
Niels ae2676e7f0 fixed Makefile 2015-04-26 22:25:38 +02:00
Niels f874b5f0f8 clean up 
- removed m_final member
- parse_internal now takes a reference to a basic_json object to fill
with data
- header is automatically regenerated if re2c file is changed
 2015-04-26 21:43:47 +02:00
Niels a372937424 fixed some small issues 2015-04-26 13:37:01 +02:00
Daniel Kopecek ad6ad4ae1e Fix compilation of json_unit with GCC 5 
Addressing:
```
+ make json_unit
g++ -std=c++11  -Wall -Wextra -pedantic -Weffc++ -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-overflow=5 -Wswitch -Wundef -Wno-unused -Wnon-virtual-dtor -Wreorder -Wdeprecated -Wfloat-equal  -I src -I test -Dprivate=public test/unit.cpp  -o json_unit
In file included from test/catch.hpp:65:0,
                 from test/unit.cpp:11:
/usr/include/c++/5.0.0/sstream:300:7: error: 'struct std::__cxx11::basic_stringbuf<_CharT, _Traits, _Alloc>::__xfer_bufptrs' redeclared with different access
       struct __xfer_bufptrs
```
 2015-04-14 16:02:49 +02:00
Niels 43417c350b fixed #42 (removed equality comparisons for floats) 2015-03-23 23:03:48 +01:00
Niels f2957dc3bf fixed #45 (added count function for keys in objects) 2015-03-22 19:07:43 +01:00
Niels d87e770767 forgot Makefile 2015-02-13 22:12:27 +01:00