Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: open-source-parsers/jsoncpp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: TechSmith/jsoncpp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 2 files changed
  • 7 contributors

Commits on Jan 30, 2015

  1. modify jsoncpp because we aren't using stdc++11

    @roballie
    roballie committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    715bf72 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2015

  1. Make string to double conversion locale invariant.

    @stephenkwagner
    stephenkwagner committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    c36b636 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. Revert "modify jsoncpp because we aren't using stdc++11" 

    This reverts commit 715bf72.
    @dchengTSC
    dchengTSC committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    d4cfa9c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from TechSmith/removeBoostDependency 

    Revert "modify jsoncpp because we aren't using stdc++11"
    @dchengTSC
    dchengTSC authored Jun 3, 2020
    Configuration menu
    Copy the full SHA
    64e0daa View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. Fix some conversion/shadowing warnings

    @dchengTSC
    dchengTSC committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    a269af3 View commit details
    Browse the repository at this point in the history

  2. Make cast from double->bool explicit

    @dchengTSC
    dchengTSC committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    58e4b7e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from TechSmith/fixWarnings 

    Fix warnings
    @dchengTSC
    dchengTSC authored Oct 20, 2020
    Configuration menu
    Copy the full SHA
    dcd666f View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. Update .gitignore to ignore /out/ and /.vs/ dirs

    @mike-malburg
    mike-malburg committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    fc6ce76 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Make string to double conversion locale invariant. 

    Applying Stephen Wagner's fix from this commit to JsonCpp 1.9.5: c36b636
    @mike-malburg
    mike-malburg committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    3385b6b View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. Merge branch 'main' into update/upstream/1.9.5

    @mike-malburg
    mike-malburg committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    3d4ef42 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from TechSmith/update/upstream/1.9.5 

    Update code from the upstream repo to v1.9.5
    @mike-malburg
    mike-malburg authored Feb 24, 2023
    Configuration menu
    Copy the full SHA
    4a4f140 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. Look at first character if parse fails.

    @ajorians
    ajorians committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    9d9bb8a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from TechSmith/feature/fixForMSVC :) 

    Fix For MSVC :)
    @ajorians
    ajorians authored Feb 27, 2023
    Configuration menu
    Copy the full SHA
    642fee9 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2025

  1. Reduce the JSONCPP_DEPRECATED_STACK_LIMIT to 500. 

    This seems to fix the issues that the security team found here: TechSmith/CamtasiaWin#23300.
    @altonlea
    altonlea committed Feb 18, 2025
    Configuration menu
    Copy the full SHA
    8a2f731 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2025

  1. Merge pull request #5 from TechSmith/fixSecurityIssue 

    Reduce the JSONCPP_DEPRECATED_STACK_LIMIT to 500.
    @altonlea
    altonlea authored Feb 19, 2025
    Configuration menu
    Copy the full SHA
    6489b57 View commit details
    Browse the repository at this point in the history
Loading