Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simple ordered_json that works on all supported compilers #2206

Merged
merged 21 commits into from
Jul 11, 2020
Merged

Simple ordered_json that works on all supported compilers #2206

merged 21 commits into from
Jul 11, 2020

Commits on Jun 21, 2020

  1. Clean-up ordered_map declarations

    gatopeich committed Jun 21, 2020
    Configuration menu
    Copy the full SHA
    27aaf6f View commit details
    Browse the repository at this point in the history

  2. Ignore allocator hardcoded to match std::map

    gatopeich committed Jun 21, 2020
    Configuration menu
    Copy the full SHA
    15337b2 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2020

  1. Use AllocatorType<ObjectType::value_type>, 

    instead of hard-coding it for std::map's value_type
    gatopeich committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    ddf0a45 View commit details
    Browse the repository at this point in the history

  2. Fix regression test

    gatopeich committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    064a9c9 View commit details
    Browse the repository at this point in the history

  3. Using ordered_json instead of fifo_map in test-regression 

    This is more comprehensive and the "my_workaround_fifo_map" wrapper does not allow to infer value type as required in this branch.

This reverts commit 064a9c9.
    gatopeich committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    5fe3d39 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2020

  1. Revert "Using ordered_json instead of fifo_map in test-regression" 

    This reverts commit 5fe3d39.
    gatopeich committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    49623a7 View commit details
    Browse the repository at this point in the history

  2. Use std::map default allocator as a placeholder 

    to extract the actual ObjectType::value_type
Still fails on older compilers (GCC <= 5.5)
    gatopeich committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    acd748e View commit details
    Browse the repository at this point in the history

  3. Re-implement ordered_map::erase, 

    so that it can handle pair<const Key,...>
    gatopeich committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    fb8c11f View commit details
    Browse the repository at this point in the history

  4. Roll-back to hard-coded object_t::value_type

    gatopeich committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    5e7bdf1 View commit details
    Browse the repository at this point in the history

  5. Use const Key in ordered map 

    (forgotten in previous commit!)
    gatopeich committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    d08fca2 View commit details
    Browse the repository at this point in the history

  6. Revert types.md

    gatopeich committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    08963d6 View commit details
    Browse the repository at this point in the history

  7. Test initialization with dup keys

    gatopeich committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    cf18ba2 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. Have 4 template parameters for ordered_map

    gatopeich committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    49f26a0 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. Make ordered_map compatible with GCC 5.5

    @ap-viavi
    ap-viavi committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    0fc261f View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. Precisely 4 template arguments for the sake of clang 3.6 (?)

    @ap-viavi
    ap-viavi committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    9377046 View commit details
    Browse the repository at this point in the history

  2. Fix compilation for xcode 9.x

    @ap-viavi
    ap-viavi committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    25f5d75 View commit details
    Browse the repository at this point in the history

  3. Clean-up unintended changes to whitespace

    @ap-viavi
    ap-viavi committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    803c16e View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. Update README.md per review comments 

    Co-authored-by: Niels Lohmann <[email protected]>
    @gatopeich @nlohmann
    gatopeich and nlohmann authored Jul 9, 2020
    Configuration menu
    Copy the full SHA
    0eb7b0a View commit details
    Browse the repository at this point in the history

  2. Removing comment about AllocatorType per review request

    gatopeich committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    f62b462 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2020

  1. Remove redundant comment

    @gatopeich
    gatopeich authored Jul 10, 2020
    Configuration menu
    Copy the full SHA
    f9a1fec View commit details
    Browse the repository at this point in the history

  2. Remove redundant comment

    @gatopeich
    gatopeich authored Jul 10, 2020
    Configuration menu
    Copy the full SHA
    47d154d View commit details
    Browse the repository at this point in the history