795 Commits

Author	SHA1	Message	Date
Théo DELRIEU	4b46abf97c	add forwarding references to json_ref constructor ... fixes #805	2017-10-28 14:22:57 +02:00
Niels Lohmann	734e2b73cf	🔨 cleanup	2017-10-27 11:49:24 +02:00
Niels Lohmann	1b1bd0e3e6	⏪ #714 is still not fixed	2017-10-23 12:01:50 +02:00
Niels Lohmann	89650c99dd	🚧 checking if #714 is now fixed with MSVC ... Hopefully, #764 fixed this.	2017-10-22 11:16:33 +02:00
Niels Lohmann	b0c380b0f8	📝 cleanup after the last PRs	2017-10-22 09:12:35 +02:00
Niels Lohmann	be4fba7baf	Merge branch 'develop' of https://github.com/nlohmann/json into develop	2017-10-22 08:53:46 +02:00
Niels Lohmann	24b6e028a9	✅ improved test coverage	2017-10-22 08:53:27 +02:00
Niels Lohmann	ef40673acb	Merge branch 'develop' into develop-simplify-istream	2017-10-22 08:52:15 +02:00
Jamie Seward	a99fcb4e7d	Add comments and newline	2017-10-17 22:53:35 -07:00
Jamie Seward	917d9d8bc3	Fix Visual Studio 2017 warnings	2017-10-16 23:23:55 -07:00
Jamie Seward	af99090742	Disable warning C4389: '==': signed/unsigned mismatch ... Lots of tests have this warning. Also moved out of for loop, doesn't need to be done every loop.	2017-10-16 01:02:48 -07:00
Jamie Seward	19f8f1c075	Add missing "u8" ... This causes test-udt to crash due to bad iterator	2017-10-16 00:21:38 -07:00
Jamie Seward	5ec44fe9e3	Add /W4 for MSVS	2017-10-15 22:56:38 -07:00
Perry Kundert	546e148b24	Further performance improvements, and corrections in get_token_string ... o An (-'ve valued, typically -1) EOF must never be allowed in token_string, as it be converted to 255 -- a legitimate value. o Comparing against a specific eof() (-1, typically) is more costly than detecting +'ve/-'ve. Since EOF is the only non-positive value allowed we can use the simpler test. o Removed unnecessary test for token_string size, as it is already tested in the method, and must never occur in correct code; used an assert instead.	2017-10-05 16:16:41 -07:00
Perry Kundert	f585fe4eec	Test to confirm parsing of multiple JSON records in a istream #367	2017-10-05 16:01:41 -07:00
Niels Lohmann	615366447a	🔧 removing -Weffc++ warnings	2017-10-05 19:43:19 +02:00
Niels Lohmann	75f4678b96	🔨 added filter script for branch coverage	2017-10-05 19:08:15 +02:00
Niels Lohmann	c204ac82e0	🔨 adjusted Coverity script to work without Makefile	2017-10-05 07:13:59 +02:00
Niels Lohmann	1b3df3a63f	🔨 trying to use Coveralls with CMake #698	2017-10-04 22:18:21 +02:00
Niels Lohmann	e2045eae53	🏁 and another try	2017-10-03 18:47:08 +02:00
Niels Lohmann	a85bc358f7	🏁 another try	2017-10-03 18:21:40 +02:00
Niels Lohmann	3457e7bc5b	🏁 try to get MSVC 2017 running again	2017-10-03 17:57:40 +02:00
Niels Lohmann	f89f8b2d0b	Merge branch 'develop' into feature/issue698	2017-10-02 17:47:53 +02:00
Niels Lohmann	8af49d4be5	🚨 removing compiler warnings #755	2017-09-30 11:00:26 +02:00
Niels Lohmann	647711fad1	✅ improved test coverage	2017-09-14 17:31:28 +02:00
Niels Lohmann	e75adc21a5	Merge branch 'develop' into feature/issue698	2017-09-13 18:57:25 +02:00
Niels Lohmann	b90529c36d	✅ improved test coverage	2017-09-13 18:56:54 +02:00
Niels Lohmann	82c93680d1	Merge branch 'develop' into feature/issue698	2017-09-10 22:38:23 +02:00
Niels Lohmann	e2e0ecd867	✅ improved test coverage	2017-09-10 22:38:04 +02:00
Niels Lohmann	248db1e423	Merge branch 'develop' into feature/issue698	2017-09-10 11:42:57 +02:00
Niels Lohmann	7410763731	✅ improved test coverage	2017-09-10 11:42:43 +02:00
Niels Lohmann	cafc2d057a	Merge branch 'develop' into feature/issue698	2017-09-10 10:22:10 +02:00
Niels Lohmann	da97cf7895	✅ improved test coverage	2017-09-10 10:21:53 +02:00
Niels Lohmann	295d65ada7	Merge branch 'develop' into feature/issue698	2017-09-10 01:13:43 +02:00
Niels Lohmann	fcba9ec537	🔨 clean up	2017-09-10 01:12:03 +02:00
Niels Lohmann	41994ba028	Merge branch 'develop' into feature/issue698	2017-09-09 16:53:37 +02:00
Niels Lohmann	b21d7810fa	✅ improved test coverage	2017-09-09 16:53:27 +02:00
Niels Lohmann	c1d6478584	Merge branch 'develop' into feature/issue698	2017-09-09 13:07:40 +02:00
Niels Lohmann	9ae6796a38	✅ improved test coverage	2017-09-09 13:07:10 +02:00
Niels Lohmann	31ce7e1e59	Merge branch 'develop' into feature/issue698	2017-09-09 11:05:20 +02:00
Niels Lohmann	fd250ae2b1	✅ improved test coverage	2017-09-09 11:04:58 +02:00
Niels Lohmann	91e0032853	📝 improved documentation	2017-08-29 23:46:26 +02:00
Niels Lohmann	4f5c345817	👷 run sanitizer another time to check if it works	2017-08-26 08:20:37 +02:00
Niels Lohmann	5e7acbf05e	👷 adjusted flags for Clang sanitizer ... we are overrding the CXXFLAGS provided by travis in order to use gcc's libstdc++	2017-08-25 22:34:00 +02:00
Niels Lohmann	268f5a3d0a	👷 added option to switch off exceptions	2017-08-25 21:29:27 +02:00
Niels Lohmann	3dcd360139	👷 adding status messages	2017-08-25 20:19:58 +02:00
Niels Lohmann	05b97c473a	👷 added flags for Valgrind and Clang sanitizer	2017-08-25 20:12:21 +02:00
Niels Lohmann	c87b080cc5	👷 new cmake file for test cases	2017-08-25 18:06:22 +02:00
Théo DELRIEU	bb1b4c934e	fix from_json implementation for pair/tuple ... Introduced by 6e4910d5c5 Fixes #707	2017-08-23 10:05:43 +02:00
Niels Lohmann	9fd031b6f4	🐛 re-added support for std::valarray #702	2017-08-22 23:28:23 +02:00