dariomt
db3c7fdb96
added missing template keyword (required by clang)
2016-01-19 16:20:27 +01:00
dariomt
e2f0e8b945
added missing typename (required by clang/gcc)
2016-01-19 14:56:07 +01:00
dariomt
4d079d135e
replicate code changes into re2c file
2016-01-18 11:32:24 +01:00
dariomt
e1645a09e9
Merge branch 'master' of https://github.com/nlohmann/json
2016-01-18 10:08:58 +01:00
Niels
72e33eec1a
thanks
2016-01-15 08:24:44 +01:00
Niels
8968885c61
Merge pull request #182 from nibroc/master
...
Fixed some typos in CONTRIBUTING.md
2016-01-15 07:21:07 +01:00
Corbin Hughes
8ecccf8628
Fixed some typos in CONTRIBUTING.md
2016-01-14 22:36:39 -06:00
Niels
c0bb5a56eb
added note on assertions ( #168 )
2016-01-13 21:08:46 +01:00
Niels
a05f27867b
fixed wrong file name
2016-01-13 20:37:05 +01:00
Niels
832fe49bc1
fixed lists
2016-01-13 20:26:47 +01:00
Niels
57e018483a
it's 2016 already...
2016-01-13 20:19:05 +01:00
Niels
1741e58eb5
contribution guidelines ( #175 )
2016-01-13 20:18:06 +01:00
Niels
4511145d3d
removing unused catch variables ( fixes #180 )
2016-01-13 19:19:35 +01:00
Niels
151d43f63e
fixing numerous typos ( fixes #179 )
2016-01-13 19:14:33 +01:00
Niels
4a452f11f9
added assertions ( #168 )
2016-01-03 17:05:27 +01:00
Niels
d27c8a8ea8
reverting OSX
2016-01-02 16:49:56 +01:00
Niels
fb7ff414ad
more Valgrind information
2016-01-02 16:42:45 +01:00
Niels
2d48a36f5c
trying Travis and OSX
2016-01-02 16:37:40 +01:00
Niels
b4bb3afb65
removed clang 3.8
2016-01-02 15:42:56 +01:00
Niels
4a87ed4441
trying Clang 3.8
2016-01-02 15:34:34 +01:00
Niels
33abe87407
forgot version number
2016-01-02 15:30:12 +01:00
Niels
dbf58ae9c0
trying to add Clang 3.7 toolchain
2016-01-02 15:24:13 +01:00
Niels
7614aa31c0
cleanup
2016-01-02 13:07:22 +01:00
Niels
9b07504e23
fix for #166
2016-01-01 18:33:58 +01:00
Niels
3905406f9c
removed an unnecessary cast ( fixed #162 )
2015-12-29 12:30:05 +01:00
Niels
aca6a3b373
version number
2015-12-28 15:04:15 +01:00
Niels
cb5581392a
preparing 1.0.0 release
2015-12-28 14:51:57 +01:00
Niels
80cdecaadd
fixed a cppcheck warning
2015-12-27 18:07:21 +01:00
Niels
d80bbffc78
minor cleanup
2015-12-27 17:58:36 +01:00
Niels
7371c71d2a
using CHECK_THROWS_WITH to check exceptions ( #160 )
2015-12-27 15:30:30 +01:00
Niels
d6b8830e03
more work on exceptions ( #160 )
2015-12-26 13:17:32 +01:00
Niels
dc8ab92552
more tests for exceptions ( #160 )
2015-12-25 13:04:40 +01:00
Niels
76e5e29eda
overworked exceptions and tests ( #160 )
2015-12-25 11:46:18 +01:00
Niels
8620583cf9
cleanup
2015-12-23 12:05:57 +01:00
Niels
fcbd984e0f
cleanup
2015-12-23 08:44:34 +01:00
Niels
70493a10d1
iterator_wrapper for const objects ( #83 )
2015-12-23 08:21:29 +01:00
Niels
00f9296db5
some cleanup for #83
2015-12-22 18:07:51 +01:00
Niels
67c2d90a21
working on #160
2015-12-22 13:27:40 +01:00
Niels
4351698c83
re-adding const version operator[] ( #135 , #159 )
...
It was a good idea to implement a const version of operator[] it in the
first place. I was a pity that this implementation was flawed. It was a
mistake to remove the const version completely. This commit
re-introduces the const version. My apologies for all the inconvenience.
2015-12-21 08:42:42 +01:00
Niels
9def0186be
upgraded Catch to v1.3.1
2015-12-20 15:42:01 +01:00
Niels
457bfc2401
work on #144
2015-12-20 15:30:07 +01:00
Niels
1adb9d62dd
fixed #156
2015-12-17 16:52:38 +01:00
Niels
ac4d4a0f66
fixed compilation error and fixed shadow warnings
2015-12-17 16:22:15 +01:00
Niels
07033f67a5
some cleanup and more documentation
2015-12-17 15:49:33 +01:00
Niels
fb972e845b
show reference to source code in documentation
2015-12-16 12:10:12 +01:00
Niels
6ac89df54d
fix for #127
2015-12-16 12:09:59 +01:00
Niels
a615598b14
cleanup documentation; started added versions
2015-12-15 19:42:32 +01:00
Niels
1df5d726d9
undid the fix for #136
2015-12-15 18:34:07 +01:00
Niels
cd04a7d3e9
fix for #133
...
added value() function to get object value at given key or a default
value if key does not exist
2015-12-15 08:38:54 +01:00
Niels
2ba901bbf6
cleanup
2015-12-14 21:23:21 +01:00
