Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

Jul 12, 2013

  1. Daniel Schauenberg

    Merge remote-tracking branch 'sourceforge-trunk' into integration

    authored

May 09, 2013

  1. - CMake: added option to turn fail compilation if warning occurs, and…

    … warning level 4 with MSVC.
    
    - Fixed some warnings
    
    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@268 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  2. - disabled warning 4786 for VS6 caused by STL (identifier was truncat…

    …ed to '255' characters in the debug information)
    
    - added batchbuild config for XP VM
    
    
    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@267 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  3. Added simple batch build script for CMake.

    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@266 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  4. Added missing source file to CMakeLists.txt.

    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@265 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  5. git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@264 1f120ed1-78a5-a8…

    …49-adca-83f0a9e25bb6
    blep authored

May 08, 2013

  1. Fixed continuous integration matrix for debug/release build. Made sta…

    …tic debug build verbose.
    
    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@263 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  2. Added continuous integration matrix for debug/release build. Made sta…

    …tic debug build verbose.
    
    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@262 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  3. Added continuous integration matrix for shared/static library (specif…

    …ied through environment variables).
    
    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@261 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  4. Added continuous integration failure e-mail notification.

    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@260 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  5. Added clang compiler for continuous integration.

    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@259 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  6. Added basic Travis CI integration contributed by Igor Okulist.

    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@258 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  7. Fixed CMake / Unix build instructions.

    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@257 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  8. - 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).
    
    
    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@256 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored

Apr 12, 2013

  1. - Patch #3393345: BOOST_FOREACH compatibility. Made Json::iterator mo…

    …re 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).
    
    
    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@255 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  2. Patch #3600941: Missing field copy in Json::Value::iterator causing i…

    …nfinite loop when using experimental internal map (#define JSON_VALUE_USE_INTERNAL_MAP) (contributed by Ming-Lin Kao).
    
    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@254 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored
  3. Patch #3539678: Copy constructor does not initialize allocated_ for s…

    …tringValue (contributed by rmongia).
    
    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@253 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored

Feb 18, 2013

  1. Fix gcc -Wall warnings (patch from Matt McCormick)

    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@252 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored

Dec 23, 2012

  1. Daniel Schauenberg

    Merge pull request #3 from rjeczalik/master

    Merged master with latest upstream changes.
    authored

Dec 20, 2012

  1. Rafal Jeczalik

    Moved merge leftovers.

    rjeczalik authored
  2. Fixed warning(error?) on #if testing value of _MSC_VER without checki…

    …ng that it was defined.
    
    git-svn-id: svn://svn.code.sf.net/p/jsoncpp/code@251 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored

Dec 17, 2012

  1. Added missing "include/json/assertions.h" header in amalgamate.py.

    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@250 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    blep authored rjeczalik committed
  2. Made it possible to drop null placeholders from array output.

    This can be used when it's clear that the consumer is able to deal with
    this, as web browsers are. Thanks to Yatin Chawathe for the patch.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@249 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    aaronjacobs authored rjeczalik committed
  3. Added an exit() to JSON_FAIL_MESSAGE to fix "no return" errors.

    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@248 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    aaronjacobs authored rjeczalik committed
  4. Got rid of several unnecessary includes of <iostream>.

    Including <iostream> causes the file to be polluted with a static
    initializer for the __ioinit symbol. This can harm binary startup time.
    For more info, see here:
    
        http://neugierig.org/software/chromium/notes/2011/08/static-initializers.html
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@247 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    aaronjacobs authored rjeczalik committed
  5. Made JSON_USE_EXCEPTION's value in config.h a default that can be ove…

    …rridden.
    
    This allows users to override it with their compiler invocation. For example:
    
        g++ -D JSON_USE_EXCEPTION=0 ...
    
    
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@246 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    aaronjacobs authored rjeczalik committed
  6. Updated bug-fix list.

    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@245 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    christopherdunn authored rjeczalik committed
  7. bug#2407932: strpbrk() could fail for NULL pointer.

    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@244 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    christopherdunn authored rjeczalik committed
  8. bug#3306345: minor typo in Path::resolve() -- missing bang.

    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@243 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    christopherdunn authored rjeczalik committed
  9. (bug#3314841) Fixed JSON_IS_AMALGAMATION. Using os.path for OSX filen…

    …ame compatibility.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@242 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    christopherdunn authored rjeczalik committed
  10. More missing constructor initializers found by Coverity.

    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@241 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    christopherdunn authored rjeczalik committed
  11. Another simple addition for constructor initialization, PathArgument.

    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@240 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    christopherdunn authored rjeczalik committed
  12. Simple changes to Reader initialization, from Chromium folks. (I do n…

    …ot think this was submitted as a bug.)
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@239 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    christopherdunn authored rjeczalik committed
  13. More eol changes.

    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@238 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    christopherdunn authored rjeczalik committed
  14. Switched CRLF to LF in repo, and added svn:eol-style native. I might …

    …have missed a few files though. Just committing what I have so far.
    
    git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@237 1f120ed1-78a5-a849-adca-83f0a9e25bb6
    christopherdunn authored rjeczalik committed
Something went wrong with that request. Please try again.