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

Allow custom base class as node customization point #3110

Merged
merged 35 commits into from
Aug 28, 2022
Merged

Allow custom base class as node customization point #3110

merged 35 commits into from
Aug 28, 2022

Commits on Aug 18, 2022

  1. Allow to add a custom base class as an extension point to json nodes 

    * by default an empty class is used and the library behaves as it already did
* if a user explicitly adds a base class (last template parameter) each node inherits it
* this can be used to add custom extensions (e.g. add metadata / visitor methods)
* add test for this feature
    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    143f868 View commit details
    Browse the repository at this point in the history

  2. Fix code for msvc

    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    a131ecc View commit details
    Browse the repository at this point in the history

  3. Fix test

    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    51d8c28 View commit details
    Browse the repository at this point in the history

  4. Re run make amalgamate

    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    8f4d8a6 View commit details
    Browse the repository at this point in the history

  5. Suppress fals positive of cppcheck

    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    09f42fd View commit details
    Browse the repository at this point in the history

  6. Fix clang-tidy errors

    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    e5534f1 View commit details
    Browse the repository at this point in the history

  7. Try fixing code for clang-tidy

    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    0046348 View commit details
    Browse the repository at this point in the history

  8. Remove make_unique to make the test c++11 compliant

    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    ef54887 View commit details
    Browse the repository at this point in the history

  9. Add NOLINT since clang-tidy requests make_unique, but C++11 jobs don'… 

    …t support it
    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    e41e315 View commit details
    Browse the repository at this point in the history

  10. Document what the include of type_traits is used for 

    Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
    @barcode @nlohmann
    2 people authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    f43c6b4 View commit details
    Browse the repository at this point in the history

  11. Add documentation

    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    5204ebb View commit details
    Browse the repository at this point in the history

  12. Fix typo 

    Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
    @barcode @nlohmann
    2 people authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    2e7e67d View commit details
    Browse the repository at this point in the history

  13. Remove accidentally duplicated doc text

    @barcode
    barcode authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    500fc0a View commit details
    Browse the repository at this point in the history

  14. Update / add documentation for custom base class

    barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    79a7056 View commit details
    Browse the repository at this point in the history

  15. Fix clang-tidy-15 warning about use after move

    barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    c427a52 View commit details
    Browse the repository at this point in the history

  16. Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 

    Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
    @barcode @falbrechtskirchinger
    2 people authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    050a831 View commit details
    Browse the repository at this point in the history

  17. Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 

    Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
    @barcode @falbrechtskirchinger
    2 people authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    21d0d38 View commit details
    Browse the repository at this point in the history

  18. Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 

    Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
    @barcode @falbrechtskirchinger
    2 people authored and barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    5539e6f View commit details
    Browse the repository at this point in the history

  19. Adapt code to review

    barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    0a8e16d View commit details
    Browse the repository at this point in the history

  20. readd suppress for cppcheck

    barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    962fca2 View commit details
    Browse the repository at this point in the history

  21. run amalgamate

    barcode committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    7cd3033 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2022

  1. Update include/nlohmann/detail/json_custom_base_class.hpp 

    Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
    @barcode @falbrechtskirchinger
    barcode and falbrechtskirchinger authored Aug 19, 2022
    Configuration menu
    Copy the full SHA
    afb108a View commit details
    Browse the repository at this point in the history

  2. Update single_include/nlohmann/json.hpp 

    Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
    @barcode @falbrechtskirchinger
    barcode and falbrechtskirchinger authored Aug 19, 2022
    Configuration menu
    Copy the full SHA
    f516209 View commit details
    Browse the repository at this point in the history

  3. Update include/nlohmann/detail/json_custom_base_class.hpp 

    Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
    @barcode @falbrechtskirchinger
    barcode and falbrechtskirchinger authored Aug 19, 2022
    Configuration menu
    Copy the full SHA
    0bcc12c View commit details
    Browse the repository at this point in the history

  4. Update single_include/nlohmann/json.hpp 

    Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
    @barcode @falbrechtskirchinger
    barcode and falbrechtskirchinger authored Aug 19, 2022
    Configuration menu
    Copy the full SHA
    b1001c6 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2022

  1. Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 

    Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
    @barcode @nlohmann
    barcode and nlohmann authored Aug 27, 2022
    Configuration menu
    Copy the full SHA
    763c59d View commit details
    Browse the repository at this point in the history

  2. Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 

    Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
    @barcode @nlohmann
    barcode and nlohmann authored Aug 27, 2022
    Configuration menu
    Copy the full SHA
    0ce9ded View commit details
    Browse the repository at this point in the history

  3. Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 

    Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
    @barcode @nlohmann
    barcode and nlohmann authored Aug 27, 2022
    Configuration menu
    Copy the full SHA
    49ab721 View commit details
    Browse the repository at this point in the history

  4. Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 

    Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
    @barcode @nlohmann
    barcode and nlohmann authored Aug 27, 2022
    Configuration menu
    Copy the full SHA
    b0f5baf View commit details
    Browse the repository at this point in the history

  5. Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 

    Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
    @barcode @nlohmann
    barcode and nlohmann authored Aug 27, 2022
    Configuration menu
    Copy the full SHA
    e9f5e0c View commit details
    Browse the repository at this point in the history

  6. Update include/nlohmann/detail/json_custom_base_class.hpp 

    Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
    @barcode @nlohmann
    barcode and nlohmann authored Aug 27, 2022
    Configuration menu
    Copy the full SHA
    b3816f1 View commit details
    Browse the repository at this point in the history

  7. make amalgamate

    barcode committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    7d476a0 View commit details
    Browse the repository at this point in the history

  8. Update include/nlohmann/detail/json_custom_base_class.hpp 

    Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
    @barcode @nlohmann
    barcode and nlohmann authored Aug 27, 2022
    Configuration menu
    Copy the full SHA
    c5ede1a View commit details
    Browse the repository at this point in the history

  9. make amalgamate

    barcode committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    19423a7 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2022

  1. Add include for nlohmann/detail/abi_macros.hpp

    barcode committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    46597f0 View commit details
    Browse the repository at this point in the history