Jamie Seward
|
73b1629a15
|
Remove tabs for spaces
|
2017-10-23 23:45:39 -07:00 |
|
Jamie Seward
|
33c6511dd0
|
Remove JSON_HAS_STRING_VIEW
Instead implement @gregmarr's PR comments that perfect forwarding should be used. Also cleaned up cpp language standard detection.
|
2017-10-23 00:43:26 -07:00 |
|
Jamie Seward
|
d468f8c4e6
|
Use consistent logic to determine if string_view exists
|
2017-10-21 16:36:05 -07:00 |
|
Jamie Seward
|
59cde1ad6e
|
Fix for _HAS_CXX17 == 0
Copied from solution to https://github.com/nlohmann/json/issues/464
|
2017-10-21 16:29:37 -07:00 |
|
Jamie Seward
|
1a66679929
|
Add string_view support
This avoids unnecessary string copies on often used
find().
|
2017-10-21 15:20:13 -07:00 |
|
Niels Lohmann
|
33df3250c3
|
Merge pull request #793 from sonulohani/develop
Error : 'identifier "size_t" is undefined' in linux
|
2017-10-21 10:58:27 +02:00 |
|
Sonu Lohani
|
92da334862
|
Error : 'identifier "size_t" is undefined' in linux
|
2017-10-21 12:52:44 +05:30 |
|
Niels Lohmann
|
2e281ba64b
|
Merge pull request #788 from jseward/develop
Fix Visual Studio 2017 warnings
|
2017-10-18 15:04:24 +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 |
|
Niels Lohmann
|
7c8f0a4186
|
Merge pull request #785 from jseward/develop
Fix warning C4706 on Visual Studio 2017 - fixes #784
|
2017-10-16 19:48:17 +02:00 |
|
Niels Lohmann
|
b27a142ec0
|
Merge pull request #783 from eld00d/patch-1
Set GENERATE_TAGFILE in Doxyfile
|
2017-10-16 17:54:28 +02: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
|
8ba7f69ab4
|
Fix whitespace
|
2017-10-16 00:49:59 -07:00 |
|
Jamie Seward
|
8a4af820c7
|
Fix warning C4706
|
2017-10-16 00:41:58 -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 |
|
Nate Vargas
|
727ee7d03e
|
Set GENERATE_TAGFILE in Doxyfile
Allows documentation to be linked from other projects to https://nlohmann.github.io/json using Doxygen with the tag:
TAGFILES = $(SOME_PATH)/nlohmann_json.tag=https://nlohmann.github.io/json
|
2017-10-14 19:06:38 -05:00 |
|
Niels Lohmann
|
d300a8e268
|
🚨 fixed warnings #776
|
2017-10-13 08:46:29 +02:00 |
|
Niels Lohmann
|
0c0851dbea
|
📝 comment how to integrate tsl::ordered_map (#546)
|
2017-10-05 20:36:18 +02:00 |
|
Niels Lohmann
|
bab4a15748
|
📝 comment how to integrate fifo_map (#485)
|
2017-10-05 20:33:27 +02:00 |
|
Niels Lohmann
|
60439aff05
|
📝 different cmake call
|
2017-10-05 19:43:59 +02:00 |
|
Niels Lohmann
|
73d1b55aba
|
🔧 executing tests in parallel
|
2017-10-05 19:43:39 +02:00 |
|
Niels Lohmann
|
615366447a
|
🔧 removing -Weffc++ warnings
|
2017-10-05 19:43:19 +02:00 |
|
Niels Lohmann
|
73727c989c
|
Merge branch 'feature/coveralls' into develop
|
2017-10-05 19:08:28 +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
|
7b82e4b4c8
|
🔨 added Makefile target to calculate lcov coverage
|
2017-10-05 00:17:09 +02:00 |
|
Niels Lohmann
|
1b3df3a63f
|
🔨 trying to use Coveralls with CMake #698
|
2017-10-04 22:18:21 +02:00 |
|
Niels Lohmann
|
99ee4c1eaf
|
🔨 cleaned up Makefiles and docs #698
|
2017-10-04 19:27:35 +02:00 |
|
Niels Lohmann
|
5cb6d7187d
|
🚨 fixing last warning in #755
|
2017-10-04 17:28:35 +02:00 |
|
Niels Lohmann
|
4e81c1db47
|
Merge pull request #765 from nlohmann/feature/issue698
using more CMake
|
2017-10-04 10:39:56 +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
|
54bd1b5124
|
Merge branch 'develop' into feature/issue698
|
2017-10-03 17:23:05 +02:00 |
|
Niels Lohmann
|
7435d54e97
|
🔨 clean up
|
2017-10-02 23:06:41 +02:00 |
|
Niels Lohmann
|
4912231450
|
Merge branch 'develop' into feature/issue698
|
2017-10-02 18:25:25 +02:00 |
|
Niels Lohmann
|
b91805e1f0
|
🚨 removing a compiler warning #755
|
2017-10-02 18:11:36 +02:00 |
|
Niels Lohmann
|
f89f8b2d0b
|
Merge branch 'develop' into feature/issue698
|
2017-10-02 17:47:53 +02:00 |
|
Niels Lohmann
|
8be303d4fb
|
🏁 fixing a min() call for MSVC #762
|
2017-10-02 13:54:14 +02:00 |
|
Niels Lohmann
|
1df836ce40
|
⏪ removed call to std::signbit #761
|
2017-10-01 15:48:29 +02:00 |
|
Niels Lohmann
|
8af49d4be5
|
🚨 removing compiler warnings #755
|
2017-09-30 11:00:26 +02:00 |
|
Niels Lohmann
|
1a66527dca
|
📝 fixed documentation #745
|
2017-09-30 10:18:18 +02:00 |
|
Niels Lohmann
|
b05ea3de55
|
Merge pull request #753 from gregmarr/patch-1
Add info for the vcpkg package.
|
2017-09-26 22:36:36 +02:00 |
|
gregmarr
|
ec60ff3451
|
Add info for the vcpkg package.
|
2017-09-26 08:39:38 -07:00 |
|
Niels Lohmann
|
647711fad1
|
✅ improved test coverage
|
2017-09-14 17:31:28 +02:00 |
|
Niels Lohmann
|
737816d0cd
|
👷 another try with Travis
|
2017-09-14 17:31:14 +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 |
|