Commit Graph

  • 54bd1b5124 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-10-03 17:23:05 +02:00
  • 7435d54e97 🔨 clean up Niels Lohmann 2017-10-02 23:06:41 +02:00
  • 4912231450 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-10-02 18:25:25 +02:00
  • b91805e1f0 🚨 removing a compiler warning #755 Niels Lohmann 2017-10-02 18:11:36 +02:00
  • f89f8b2d0b Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-10-02 17:47:53 +02:00
  • 8be303d4fb 🏁 fixing a min() call for MSVC #762 Niels Lohmann 2017-10-02 13:54:14 +02:00
  • 1df836ce40 removed call to std::signbit #761 Niels Lohmann 2017-10-01 15:48:29 +02:00
  • 8af49d4be5 🚨 removing compiler warnings #755 Niels Lohmann 2017-09-30 11:00:26 +02:00
  • 1a66527dca 📝 fixed documentation #745 Niels Lohmann 2017-09-30 10:18:18 +02:00
  • b05ea3de55 Merge pull request #753 from gregmarr/patch-1 Niels Lohmann 2017-09-26 22:36:36 +02:00
  • ec60ff3451 Add info for the vcpkg package. gregmarr 2017-09-26 08:39:38 -07:00
  • 647711fad1 improved test coverage Niels Lohmann 2017-09-14 17:31:28 +02:00
  • 737816d0cd 👷 another try with Travis Niels Lohmann 2017-09-14 17:31:14 +02:00
  • e75adc21a5 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-13 18:57:25 +02:00
  • b90529c36d improved test coverage Niels Lohmann 2017-09-13 18:56:54 +02:00
  • 82c93680d1 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 22:38:23 +02:00
  • e2e0ecd867 improved test coverage Niels Lohmann 2017-09-10 22:38:04 +02:00
  • 248db1e423 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 11:42:57 +02:00
  • 7410763731 improved test coverage Niels Lohmann 2017-09-10 11:42:43 +02:00
  • cafc2d057a Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 10:22:10 +02:00
  • da97cf7895 improved test coverage Niels Lohmann 2017-09-10 10:21:53 +02:00
  • 295d65ada7 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-10 01:13:43 +02:00
  • fcba9ec537 🔨 clean up Niels Lohmann 2017-09-10 01:12:03 +02:00
  • 41994ba028 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-09 16:53:37 +02:00
  • b21d7810fa improved test coverage Niels Lohmann 2017-09-09 16:53:27 +02:00
  • c1d6478584 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-09 13:07:40 +02:00
  • 9ae6796a38 improved test coverage Niels Lohmann 2017-09-09 13:07:10 +02:00
  • 31ce7e1e59 Merge branch 'develop' into feature/issue698 Niels Lohmann 2017-09-09 11:05:20 +02:00
  • fd250ae2b1 improved test coverage Niels Lohmann 2017-09-09 11:04:58 +02:00
  • 5c08b84dec back to previous MSVC 2017 Niels Lohmann 2017-09-06 18:26:52 +02:00
  • da14286abb 👷 try to use MSVC 2017 again Niels Lohmann 2017-09-06 18:13:35 +02:00
  • c607b5c2ac 📝 improved documentation Niels Lohmann 2017-09-06 17:14:06 +02:00
  • 91e0032853 📝 improved documentation Niels Lohmann 2017-08-29 23:46:26 +02:00
  • b41b13047c 👷 removed unneccessary test Niels Lohmann 2017-08-27 11:30:36 +02:00
  • 15e757c42b 🔨 trying to fix memory issue with valarray Niels Lohmann 2017-08-27 10:41:39 +02:00
  • 0e94ba8857 👷 using the same compilers Niels Lohmann 2017-08-26 08:56:34 +02:00
  • 4f5c345817 👷 run sanitizer another time to check if it works Niels Lohmann 2017-08-26 08:20:37 +02:00
  • 8608f42187 👷 trying to use libstdc++ Niels Lohmann 2017-08-25 22:49:18 +02:00
  • 5e7acbf05e 👷 adjusted flags for Clang sanitizer Niels Lohmann 2017-08-25 22:34:00 +02:00
  • 268f5a3d0a 👷 added option to switch off exceptions Niels Lohmann 2017-08-25 21:29:27 +02:00
  • 839681ff9f 👷 using Ninja Niels Lohmann 2017-08-25 21:01:07 +02:00
  • 3dcd360139 👷 adding status messages Niels Lohmann 2017-08-25 20:19:58 +02:00
  • 05b97c473a 👷 added flags for Valgrind and Clang sanitizer Niels Lohmann 2017-08-25 20:12:21 +02:00
  • c87b080cc5 👷 new cmake file for test cases Niels Lohmann 2017-08-25 18:06:22 +02:00
  • 5b71bf09a1 Merge pull request #708 from theodelrieu/fix/from_json_tuple_pair Niels Lohmann 2017-08-24 12:40:16 +02:00
  • bb1b4c934e fix from_json implementation for pair/tuple Théo DELRIEU 2017-08-22 23:40:10 +02:00
  • e45eaf6e30 Revert "👷 using libc++ with Clang" Niels Lohmann 2017-08-23 08:39:19 +02:00
  • 0b5e8f859b 🔨 cleanup Niels Lohmann 2017-08-23 00:42:15 +02:00
  • 9fd031b6f4 🐛 re-added support for std::valarray #702 Niels Lohmann 2017-08-22 23:28:23 +02:00
  • 41b2c69bdb 👷 using libc++ with Clang Niels Lohmann 2017-08-22 22:04:38 +02:00
  • cd53790993 👷 using Clang 5.0 Niels Lohmann 2017-08-21 20:03:24 +02:00
  • e569b9736b 👷 trying to fix build error Niels Lohmann 2017-08-21 17:31:14 +02:00
  • ba5d37ba4b 👷 added Clang 5.0 (see https://docs.travis-ci.com/user/languages/cpp/#clang) Niels Lohmann 2017-08-21 17:27:35 +02:00
  • 64ef100ebf Revert "💥 changed iterators to andom_access_iterator #593" Niels Lohmann 2017-08-20 20:44:44 +02:00
  • 8acaf5bdbc 🚨 fixing two compiler warnings Niels Lohmann 2017-08-20 19:31:07 +02:00
  • c77a0be5f3 💥 changed iterators to andom_access_iterator #593 Niels Lohmann 2017-08-16 21:35:22 +02:00
  • aba8b58492 🔨 approach to un-break the changes for #462 Niels Lohmann 2017-08-16 20:11:05 +02:00
  • 22b59693f1 💥 CBOR/MessagePack input must end with EOF #505 Niels Lohmann 2017-08-16 14:48:23 +02:00
  • 1f31a5b808 ⬆️ Catch v1.9.7 Niels Lohmann 2017-08-16 10:23:39 +02:00
  • f5a53de845 👷 running sanitizer job in parallel Niels Lohmann 2017-08-16 09:21:20 +02:00
  • 21726d8d8f 👷 run sanitizer after tests Niels Lohmann 2017-08-16 08:11:02 +02:00
  • df572aca79 👷 set sanitizer to clang4 Niels Lohmann 2017-08-16 07:42:57 +02:00
  • 4391bf5615 Merge branch 'feature/update' into develop Niels Lohmann 2017-08-16 07:39:30 +02:00
  • 1e360bb32b 🔨 preparation for #505 Niels Lohmann 2017-08-16 07:39:11 +02:00
  • 002410410f Merge branch 'develop' into feature/update Niels Lohmann 2017-08-15 21:42:58 +02:00
  • 72afe53fa0 📝 updated documentation for update() function #661 Niels Lohmann 2017-08-15 21:42:50 +02:00
  • 76123fab76 📝 added note wrt. #667 Niels Lohmann 2017-08-15 20:49:18 +02:00
  • fdff42bc3d 👷 forgot to install Cmake on OSX Niels Lohmann 2017-08-15 20:30:01 +02:00
  • 039e2f03bc Merge branch 'develop' into feature/update Niels Lohmann 2017-08-15 19:54:22 +02:00
  • 7f4722a75d Merge branch 'feature/travis_clang' into develop Niels Lohmann 2017-08-15 19:52:47 +02:00
  • 08805f7f14 🔨 cleanup Niels Lohmann 2017-08-13 20:57:27 +02:00
  • 988077e046 Merge branch 'develop' into feature/travis_clang Niels Lohmann 2017-08-13 20:27:27 +02:00
  • 7d19aed567 🔨 cleanup Niels Lohmann 2017-08-13 19:02:58 +02:00
  • 569c00eb18 👷 changed c++17 to c++1z Niels Lohmann 2017-08-10 23:41:12 +02:00
  • 6151b056eb 🔨 cleanup Niels Lohmann 2017-08-10 23:40:30 +02:00
  • bade3b3e6c 👷 cleanup Niels Lohmann 2017-08-10 21:17:40 +02:00
  • 76b195d7d1 👷 fix for coverity + clang-5.0 Niels Lohmann 2017-08-10 20:54:59 +02:00
  • cd34358e7c 👷 removing clang from source Niels Lohmann 2017-08-10 20:37:23 +02:00
  • 5eb9f5fd4f 👷 clang-3.4 Niels Lohmann 2017-08-10 20:31:59 +02:00
  • f49356e703 👷 clang-3.4 Niels Lohmann 2017-08-10 20:26:49 +02:00
  • e0f8eb1710 👷 clang-4.0 Niels Lohmann 2017-08-10 20:21:41 +02:00
  • 6dc89e47fc 👷 clang-3.9 Niels Lohmann 2017-08-10 20:16:35 +02:00
  • 8de710bbe7 👷 added source for gcc Niels Lohmann 2017-08-10 20:12:27 +02:00
  • 195d773bc5 👷 added gcc Niels Lohmann 2017-08-10 20:09:39 +02:00
  • e7f2d2646a 👷 removed gcc Niels Lohmann 2017-08-10 20:06:47 +02:00
  • 6b20f6d1ef 👷 clang-3.8 Niels Lohmann 2017-08-10 20:04:36 +02:00
  • 82cd8c8d02 👷 another try Niels Lohmann 2017-08-10 19:59:00 +02:00
  • f256587c4f 👷 clang-3.4 Niels Lohmann 2017-08-10 19:56:09 +02:00
  • c06b5c5c10 👷 clang-3.5 Niels Lohmann 2017-08-10 19:50:36 +02:00
  • 3283352db3 👷 using clang++ Niels Lohmann 2017-08-10 19:45:33 +02:00
  • c20dd7522f 👷 another try Niels Lohmann 2017-08-10 19:40:09 +02:00
  • 94dfecd487 👷 removed g++ Niels Lohmann 2017-08-10 19:31:43 +02:00
  • 8963aae57d 👷 clang-3.6 Niels Lohmann 2017-08-10 19:24:36 +02:00
  • 5aceb0e029 👷 clang-3.6 Niels Lohmann 2017-08-10 19:23:55 +02:00
  • e7a7e4f81f 👷 fixed compiler Niels Lohmann 2017-08-10 19:18:45 +02:00
  • e333562633 👷 different source Niels Lohmann 2017-08-10 19:15:16 +02:00
  • eb6de822bb 👷 clang-3.7 Niels Lohmann 2017-08-10 19:12:04 +02:00
  • c1642affaa 👷 clang-3.8 Niels Lohmann 2017-08-10 19:03:35 +02:00
  • a46afd4008 Merge pull request #679 from traits/patch-1 Niels Lohmann 2017-08-10 11:39:13 +02:00
  • 54c67dcfec Update json.hpp traits 2017-08-10 09:05:00 +02:00