Commit Graph

  • c138933784 Merge pull request #26 from alex-ac/master Christopher Dunn 2014-08-13 01:12:44 -07:00
  • b3deb61f87 Fix CMake subproject behaviour. Aleksandr Derbenev 2014-08-09 22:21:33 +04:00
  • 740e0207b1 Merge pull request #25 from cgilling/master Christopher Dunn 2014-08-13 01:09:31 -07:00
  • 97c77b4a86 add tests to check that exceptions are thrown for wrong types Chris Gilling 2014-08-08 16:22:28 -07:00
  • 7ebdabc059 Merge pull request #23 from mloy/msvc2010 Christopher Dunn 2014-08-13 01:03:20 -07:00
  • c6d9424f71 project files for msvc2010 mloy 2014-08-07 14:24:38 +02:00
  • 19d0ece5f9 add solution for msvc 2010 mloy 2014-08-07 14:16:00 +02:00
  • 35e4f2abd6 Merge pull request #22 from AlexeyKruchinin/patch-1 Christopher Dunn 2014-08-13 01:01:37 -07:00
  • c9e76909c6 Fixed deprecated target file path location Egor Tensin 2014-08-11 01:42:37 +04:00
  • 2511b4ffb7 Fix CMake subproject behaviour. Aleksandr Derbenev 2014-08-09 22:21:33 +04:00
  • c72813784d add tests to check that exceptions are thrown for wrong types Chris Gilling 2014-08-08 16:22:28 -07:00
  • 76cab2edc4 project files for msvc2010 mloy 2014-08-07 14:24:38 +02:00
  • 12a8baf8a2 add solution for msvc 2010 mloy 2014-08-07 14:16:00 +02:00
  • b548cdf49c Update README.md Alexey Kruchinin 2014-08-06 23:24:34 -04:00
  • 848397eb88 Patch for bug #53 on version 0.5.0 David West 2014-07-31 13:18:02 -04:00
  • 3b9b7402fd Merge pull request #14 from eightnoteight/master Christopher Dunn 2014-07-13 23:52:14 -07:00
  • 3585477f33 add file version.h temporarily commented | header include path modified eightnoteight 2014-07-14 11:11:14 +05:30
  • 27e3263894 WinCE Compatibility Fix pffang 2014-07-10 10:19:01 +08:00
  • 8582876c5c vim modelines Christopher Dunn 2014-07-10 20:22:25 -07:00
  • 496c655523 fix numeric locale Christopher Dunn 2014-07-10 20:22:47 -07:00
  • 49c732607b Revert "Merge pull request #7 from steffen-kiess/fix-locale" Christopher Dunn 2014-07-10 19:58:05 -07:00
  • b1910013f7 Merge 348a6545c03e6ba1b91a677fd68d7e9716406290 into 655a9db0cc62394e81d3074a98c7191fbfc00259 Steffen Kieß 2014-07-10 17:33:03 +00:00
  • e2818e50a2 Merge ce8d81bed7b6d463cbe2d2c2a1eecdc0cf6ee788 into 655a9db0cc62394e81d3074a98c7191fbfc00259 pffang 2014-07-10 12:09:07 +00:00
  • 655a9db0cc Merge pull request #11 from cdunn2001/inc Christopher Dunn 2014-07-09 21:53:40 -07:00
  • f3989977c0 rm generated version.h Christopher Dunn 2014-07-09 21:47:43 -07:00
  • 60f778b9fc relative include Christopher Dunn 2014-07-09 21:37:23 -07:00
  • 50f6779578 Merge pull request #10 from cdunn2001/doxy Christopher Dunn 2014-07-09 21:29:18 -07:00
  • ce8d81bed7 Fix line endings pffang 2014-07-10 11:26:41 +08:00
  • c461f9b294 valueToString fix for WINCE pffang 2014-07-10 11:21:36 +08:00
  • dbdd6b1fd7 Merge 6b021970ad6341bc4aa96a33636ed9c5ed77d46f into 0db9d6ea013792b010c598c2a9a3a9e39a2decd9 pffang 2014-07-10 02:25:34 +00:00
  • 6b021970ad Fix for newline style pffang 2014-07-10 10:24:25 +08:00
  • 3020f36b3b WinCE Compatibility Fix pffang 2014-07-10 10:19:01 +08:00
  • 5a65132e72 README/NEWS links Christopher Dunn 2014-07-05 20:44:33 -07:00
  • bef834edca update docs for open-source-parsers org Christopher Dunn 2014-07-05 19:05:10 -07:00
  • 0973f2e6bc after doxygen -u Christopher Dunn 2014-07-05 14:15:24 -07:00
  • 5031a59518 doxygen changed Christopher Dunn 2014-07-05 13:52:15 -07:00
  • 5850b83a5b moved roadmap to wiki Christopher Dunn 2014-07-05 12:51:31 -07:00
  • 9dd7eea945 fix doxybuild.py paths Christopher Dunn 2014-07-05 12:37:27 -07:00
  • 35bea41bc9 update docs for github Christopher Dunn 2014-07-05 12:13:37 -07:00
  • 542cd1d3f5 remove some sourceforge links Christopher Dunn 2014-07-05 12:13:20 -07:00
  • ba50403414 ignore doxygen stuff Christopher Dunn 2014-07-04 16:02:41 -07:00
  • 0db9d6ea01 Merge pull request #7 from cdunn2001/fix-locale Christopher Dunn 2014-07-09 11:41:14 -07:00
  • b8aaa03367 Use std::stringstream instead of snprintf() for double->string conversion Steffen Kieß 2014-07-02 13:31:15 +02:00
  • eab30969a3 Use std::stringstream instead of snprintf() for double->string conversion Steffen Kieß 2014-07-02 13:31:15 +02:00
  • 06dcb1fc89 cmake updates this Christopher Dunn 2014-07-08 21:57:12 -07:00
  • 348a6545c0 Use std::stringstream instead of snprintf() for double->string conversion Steffen Kieß 2014-07-02 13:31:15 +02:00
  • 973de3988b Merge pull request #1 from cdunn2001/patch-renu555 Christopher Dunn 2014-07-05 19:10:34 -07:00
  • 41b79398a3 Always true condition. renu555 2014-07-02 14:33:37 +05:30
  • 66b77384d8 Fix dead code scenario. renu555 2014-07-02 14:23:54 +05:30
  • 17c244e644 Fixing unreachable condition. renu555 2014-07-02 09:19:00 +05:30
  • 8050d8b677 Merge pull request #6 from cdunn2001/fix-static-init Christopher Dunn 2014-07-05 17:39:19 -07:00
  • 28836b8acc fix bug for static init Christopher Dunn 2014-07-05 13:52:19 -07:00
  • 47f1577fd3 Gave the license section a makeover. Aaron Jacobs 2014-07-01 13:13:46 +10:00
  • 9cc184146f Gave the test output section a makeover. Aaron Jacobs 2014-07-01 13:13:03 +10:00
  • c151549937 Gave the reader/writer test section a makeover. Aaron Jacobs 2014-07-01 13:11:05 +10:00
  • d61fa29da8 Gave the amalgamated source section a makeover. Aaron Jacobs 2014-07-01 13:09:15 +10:00
  • b2a086adeb Gave the documentation section a makeover. Aaron Jacobs 2014-07-01 13:07:21 +10:00
  • 8d0f8d0dcd Gave the testing section a makeover. Aaron Jacobs 2014-07-01 13:06:40 +10:00
  • 49ed6c9774 Gave the scons section a makeover. Aaron Jacobs 2014-07-01 12:06:16 +10:00
  • 38c9826423 Gave the cmake section a makeover. Aaron Jacobs 2014-07-01 12:02:57 +10:00
  • 969921748b Gave the using section a makeover. Aaron Jacobs 2014-07-01 11:59:25 +10:00
  • ff22ca7973 Gave the introduction section a makeover. Aaron Jacobs 2014-07-01 11:56:56 +10:00
  • 4b687640cb Began converting the README to Markdown. Aaron Jacobs 2014-07-01 11:54:14 +10:00
  • 3a0c4fcc82 Ran clang-format again. Aaron Jacobs 2014-07-01 09:20:48 +10:00
  • 445328ace6 Fixed some clang-format weirdness. Aaron Jacobs 2014-07-01 09:15:11 +10:00
  • 9fa4e849a1 Ran clang-format over all .h and .cpp files. Aaron Jacobs 2014-07-01 08:48:54 +10:00
  • 1b137a3802 Set BinPackParameters to false. Aaron Jacobs 2014-07-01 08:47:46 +10:00
  • fd6ada015e Added a clang-format config file, in preparation for formatting jsoncpp. Aaron Jacobs 2014-07-01 08:45:32 +10:00
  • 8540868347 Fixed some cruft in the Travis CI config file. Aaron Jacobs 2014-06-30 19:57:59 +10:00
  • 2de98d9bd1 Updated notification settings for Travis CI. Aaron Jacobs 2014-06-30 19:51:29 +10:00
  • 6764059395 fix stdexcept svn-import Christopher Dunn 2014-05-13 09:49:25 +00:00
  • 5d32295a6e Fixed a test that causes a crash when exceptions are disabled. Aaron Jacobs 2014-04-23 23:57:59 +00:00
  • 68db655347 Added structured error reporting to Reader. Aaron Jacobs 2014-04-23 23:41:12 +00:00
  • 642befc836 Added features that allow the reader to accept common non-standard JSON. Aaron Jacobs 2014-04-23 23:28:23 +00:00
  • 77cd83890d vim modeline Christopher Dunn 2014-04-19 21:41:03 +00:00
  • 09439b7bc7 Comment reading/write improvements Christopher Dunn 2014-04-19 21:19:24 +00:00
  • ea0797351f JSON_ASSERT -> JSON_ASSERT_MESSAGE Christopher Dunn 2014-04-19 06:37:23 +00:00
  • 94d17e9fdf Added missing includes for std::istream. Aaron Jacobs 2014-01-29 00:13:38 +00:00
  • a3f19c23a0 Fixed broken build on VS 2012 Baptiste Lepilleur 2013-09-23 14:10:39 +00:00
  • d2618806ba Fixed some snprintf-related build breakages in Visual Studio. Aaron Jacobs 2013-08-08 23:08:28 +00:00
  • 36400ac0c1 Updated two calls to sprintf that I missed in r269. Aaron Jacobs 2013-08-08 00:39:32 +00:00
  • 32ffb931e7 Replaced the complex implementation of valueToString(double). Aaron Jacobs 2013-08-08 00:39:12 +00:00
  • bb53cd0899 Added more floating point tests. Aaron Jacobs 2013-08-08 00:37:39 +00:00
  • 4c531bb584 Added further floating point tests. Aaron Jacobs 2013-08-08 00:13:10 +00:00
  • 42d918b7aa Switched away from sprintf, which is prone to buffer overflows. Aaron Jacobs 2013-08-06 23:12:56 +00:00
  • 700b38020e - CMake: added option to turn fail compilation if warning occurs, and warning level 4 with MSVC. - Fixed some warnings Baptiste Lepilleur 2013-05-09 18:42:33 +00:00
  • 7b62ceacee - disabled warning 4786 for VS6 caused by STL (identifier was truncated to '255' characters in the debug information) - added batchbuild config for XP VM Baptiste Lepilleur 2013-05-09 16:24:13 +00:00
  • cb5ae30f6e Added simple batch build script for CMake. Baptiste Lepilleur 2013-05-09 15:22:14 +00:00
  • 58b6541478 Added missing source file to CMakeLists.txt. Baptiste Lepilleur 2013-05-09 15:21:06 +00:00
  • 1ccfdfcb9b Baptiste Lepilleur 2013-05-09 15:20:32 +00:00
  • 71860de813 Fixed continuous integration matrix for debug/release build. Made static debug build verbose. Baptiste Lepilleur 2013-05-08 22:23:07 +00:00
  • c515b8ec30 Added continuous integration matrix for debug/release build. Made static debug build verbose. Baptiste Lepilleur 2013-05-08 22:15:15 +00:00
  • 5fff185aa4 Added continuous integration matrix for shared/static library (specified through environment variables). Baptiste Lepilleur 2013-05-08 22:04:57 +00:00
  • 10712e85d6 Added continuous integration failure e-mail notification. Baptiste Lepilleur 2013-05-08 21:23:52 +00:00
  • 53c08ad916 Added clang compiler for continuous integration. Baptiste Lepilleur 2013-05-08 21:04:42 +00:00
  • 79e90fba0b Added basic Travis CI integration contributed by Igor Okulist. Baptiste Lepilleur 2013-05-08 20:46:56 +00:00
  • ce277aa6e4 Fixed CMake / Unix build instructions. Baptiste Lepilleur 2013-05-08 20:37:54 +00:00
  • eafd702a17 - New CMake based build system. Based in part on contribution from Igor Okulist and Damien Buhl (Patch #14). Added support for running tests and building with DLL on Windows. - added missing JSON_API - Visual Studio DLL: suppressed warning "C4251: <data member>: <type> needs to have dll-interface to be used by..." via pragma push/pop in json-cpp headers. - New header json/version.h now contains version number macros (JSONCPP_VERSION_MAJOR, JSONCPP_VERSION_MINOR, JSONCPP_VERSION_PATCH and JSONCPP_VERSION_HEXA). While this header is generated by CMake, it is committed to ease build with alternate build system (CMake only update the file when it changes avoid issues with VCS). Baptiste Lepilleur 2013-05-08 20:21:11 +00:00
  • a8afdd40af - Patch #3393345: BOOST_FOREACH compatibility. Made Json::iterator more standard compliant, added missing iterator_category and value_type typedefs (contribued by Robert A. Iannucci). - Patch #3474563: added missing JSON_API on some classes causing link issues when building as a dynamic library on Windows (contributed by Francis Bolduc). Baptiste Lepilleur 2013-04-12 14:10:13 +00:00
  • f92ace5e82 Patch #3600941: Missing field copy in Json::Value::iterator causing infinite loop when using experimental internal map (#define JSON_VALUE_USE_INTERNAL_MAP) (contributed by Ming-Lin Kao). Baptiste Lepilleur 2013-04-12 13:26:23 +00:00