Niels Lohmann
b5d1755dfb
🔥 removed commented-out test cases #1060
2018-04-22 15:41:42 +02:00
Niels Lohmann
0ab8fab338
Merge pull request #1058 from dns13/patch-1
...
Fix typo
2018-04-17 23:26:00 +05:30
Jan Schöppach
65b4d8251b
Fix typo in single_include, too
2018-04-17 13:02:36 +02:00
Jan Schöppach
53fb230098
Fix typo
2018-04-17 12:08:44 +02:00
Niels Lohmann
46ec2fddf8
📝 updated THANKS list
2018-04-10 18:13:37 +02:00
Niels Lohmann
b8bfd1140d
Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements
...
Misc cmake packaging enhancements
2018-04-10 17:57:21 +02:00
Chuck Atkins
33a2154f8d
Enable target namespaces and build dir project config
...
CMake convention is to use a project namespace, i.e. Foo::, for imported
targets. When multiple targets are imported from a project, this looks
like Foo::Bar1 Foo::Bar2, etc. This adds the nlohmann_json:: namespace to
the exported target names.
This also allows the generated project config files to be used from the
build directory instead of just the install directory.
2018-04-10 09:08:38 -04:00
Niels Lohmann
29362c6ace
Merge pull request #1047 from jammehcow/patch-1
...
Fixed incorrect LLVM version number in README
2018-04-10 08:39:58 +02:00
Niels Lohmann
c02a3155d4
👷 added Xcode 9.3 builder
...
See https://blog.travis-ci.com/2018-04-09-say-bonjour-to-xcode-93-and-macos-high-sierra .
2018-04-10 08:39:28 +02:00
James Upjohn
7f20e9ddc7
Fixed incorrect version number in README
...
clang-900.0.39.2 is from LLVM 9.0.0, not 8.1.0
2018-04-10 17:16:44 +12:00
Chuck Atkins
031b88d315
Make the CMake install dir user-configurable
2018-04-09 11:31:25 -04:00
Niels Lohmann
7c503c64b7
Merge pull request #1043 from coryan/patch-1
...
Fix trivial typo in comment.
2018-04-09 08:19:56 +02:00
Carlos O'Ryan
4286b16b71
Fix trivial typo in comment.
...
Not really important, but since I saw it.
2018-04-08 15:46:25 -04:00
Niels Lohmann
acf10d9af7
Merge pull request #1041 from ax3l/topic-spack
...
Package Manager: Spack
2018-04-08 11:32:35 +02:00
Niels Lohmann
40f279c59d
Merge branch 'feature/issue1021' into develop
2018-04-08 09:28:37 +02:00
Niels Lohmann
18a0271a95
Merge branch 'develop' into feature/issue1021
2018-04-08 09:21:43 +02:00
Axel Huebl
1ae9896387
Package Manager: Spack
...
I contributed a package to the Spack package manager.
Spack is a flexible package manager that supports multiple versions,
configurations, platforms, and compilers. It is popular in
high-performance computing.
2018-04-08 01:12:49 +02:00
Niels Lohmann
83b143382e
Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin
...
CMake: 3.8+ is Sufficient
2018-04-07 15:14:59 +02:00
Axel Huebl
e439a1a9a7
CMake: 3.8+ is Sufficient
...
The current CMake scripts depend on CMake 3.8+.
This allows us to remove previous work-arounds.
2018-04-07 13:15:44 +02:00
Niels Lohmann
495436a5d5
Merge pull request #1026 from ktonon/develop
...
Added public target_compile_features for auto and constexpr
2018-04-03 17:34:42 +02:00
Kevin Tonon
a35d414c39
Update CMake to latest on Travis
2018-04-03 08:28:07 -04:00
Niels Lohmann
4efa8cdb4c
💚 fixed Valgrind options #1030
2018-03-29 17:19:21 +02:00
Niels Lohmann
830c93fd09
📝 fixed example for operator> #1029
2018-03-29 17:07:55 +02:00
Niels Lohmann
896a9db461
🔨 improved code #1021
2018-03-28 19:37:21 +02:00
Kevin Tonon
73cc5089e3
Using target_compile_features to specify C++ 11 standard
2018-03-28 13:11:49 -04:00
Niels Lohmann
a9baab76c2
🚑 fix for #1021
2018-03-28 18:20:55 +02:00
Niels Lohmann
d2dd27dc3b
Merge branch 'release/3.1.2' into develop
2018-03-14 21:48:03 +01:00
Niels Lohmann
8a6c8cb0f7
🔖 set version to 3.1.2
2018-03-14 21:32:03 +01:00
Niels Lohmann
afef474c0d
🔖 set version to 3.1.2
2018-03-14 21:09:27 +01:00
Niels Lohmann
919d1fef8f
Merge pull request #1009 from nlohmann/user_string_parser
...
Allowing for user-defined string type in lexer/parser
2018-03-13 14:52:59 +01:00
Niels Lohmann
8557151d90
♻️ adjusting lexer/parser in symmetry to #1006
2018-03-12 19:15:11 +01:00
Niels Lohmann
b56ac86471
📝 thanks for #1006
2018-03-12 18:44:19 +01:00
Niels Lohmann
0cab3b2c8e
Merge pull request #1006 from agrianius/dump-template
...
dump to alternative string type, as defined in basic_json template
2018-03-12 18:41:59 +01:00
Vitaliy Manushkin
392c033805
test refactoring
2018-03-11 00:29:04 +03:00
Vitaliy Manushkin
51349537fc
add unit test: checking dump to alternative string type
2018-03-10 23:59:10 +03:00
Vitaliy Manushkin
830f3e5290
forward alternative string class from output_adapter to output_string_adapter
2018-03-10 23:58:16 +03:00
Vitaliy Manushkin
ed6b1464f9
dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code)
2018-03-10 17:36:51 +03:00
Vitaliy Manushkin
faccc37d0d
dump to alternate implementation of string, as defined in basic_json template
2018-03-10 17:19:28 +03:00
Niels Lohmann
6151dfaed7
👌 made changes proposed in #1001
2018-03-10 11:02:58 +01:00
Niels Lohmann
9918523077
📝 cleanup after #1001
2018-03-09 21:31:46 +01:00
Niels Lohmann
e737de8941
Merge pull request #1001 from nlohmann/leak
...
Fix memory leak during parser callback
2018-03-09 21:23:00 +01:00
Niels Lohmann
aa8fc2a41c
🚑 hopefully fixed the memory leak
2018-03-08 17:11:15 +01:00
Niels Lohmann
cf60e18c89
🔥 removing failing test (work on this in branch "leak")
2018-03-08 07:39:21 +01:00
Niels Lohmann
97559bb1b2
🔨 trying to fix the leak
...
Part 1: properly use forwarding
2018-03-08 07:36:56 +01:00
Niels Lohmann
38345fd06c
👌 fixed some more warnings
2018-03-07 22:51:22 +01:00
Niels Lohmann
d183d34b96
💚 added another test case
2018-03-07 22:25:25 +01:00
Niels Lohmann
d2d65bb25b
♻️ refined SFINAE to fix some warnings
2018-03-07 22:01:44 +01:00
Niels Lohmann
476b2e09be
💚 added regression tests for #972 and #977
2018-03-06 20:13:31 +01:00
Niels Lohmann
62030615a0
Merge pull request #986 from theodelrieu/fix/basic_json_conversion
...
Fix/basic json conversion
2018-03-06 19:27:39 +01:00
Niels Lohmann
fdecbf6e1e
Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition
...
fixed misprinted condition detected by PVS Studio.
2018-03-05 15:57:57 +01:00
