Squashed 'external/json/' changes from 9cca280a4..60c48755e

60c48755e Add missing macros in README and link to docs for more info (#4582)
a6255cc41 add a ci step for Json_Diagnostic_Positions (#4579)
f038ac4c9 Enable modernize-use-integer-sign-comparison check (#4581)
4f64d8d0b Modernize integer comparison (#4577)
2134cb947 Fix NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT with an empty JSON instance (#4508)
6057b31df Overwork astyle call (#4573)
0fa326a8e Use Clang image to run iwyu (#4574)
8314ac2f7 Use ubuntu-latest image to run Valgrind (#4575)
69c8758d5 fix the abi tests for diagnostics positions feature (#4572)
5ff90d9e0 fix diagnostic positions related compilation errors (#4570)
6be4e8560 Bump cppcheck from 1.4.6 to 1.4.7 in /cmake/requirements (#4567)
663058e7d Fix typo in nlohmann_define_derived_type.md (#4565)
af4ad7915 Add ONLY_SERIALIZE for NLOHMANN_DEFINE_DERIVED_TYPE_* macros (#4562)
58f5f2596 json start/end position implementation (#4517)
733c59588 Bump actions/upload-artifact from 4.4.3 to 4.5.0 (#4557)
6cb099e30 Suppress modernize-use-integer-sign-comparison (#4558)
094bd2651 Set parents after insert call (#4537)
30cd44df9 Clean up CI (#4553)
5362012fd [StepSecurity] ci: Harden GitHub Actions (#4551)
861ec9c3c Fix token permissions warnings (#4550)
f4910b20c Bump mkdocs-material from 9.5.48 to 9.5.49 in /docs/mkdocs (#4548)
f2a4ac067 Add step to build the documentation (#4549)
8e1b80001 Move reuse dependency to requirements.txt file (#4547)
677e19e39 Clean up  (#4546)
9e23b5d61 ⬆️ Bump watchdog from 2.1.7 to 6.0.0 in /tools/serve_header (#4542)
eb142e33c ⬆️ Bump ossf/scorecard-action from 2.3.3 to 2.4.0 (#4545)
1c8e26dcb ⬆️ Bump lukka/get-cmake from 3.31.0 to 3.31.2 (#4544)
b6b8378c8 ⬆️ Bump github/codeql-action from 2.27.9 to 3.27.9 (#4543)
58949c0ad ⬆️ Bump actions/github-script from 6.4.0 to 7.0.1 (#4540)
7cfbe321b ⬆️ Bump pyyaml from 6.0 to 6.0.2 in /tools/serve_header (#4541)
4003f8da0 [StepSecurity] Apply security best practices (#4539)
6a2ae22a5 📝 add OpenSSF Scorecard badge
620034ece ♻️ allow patch and diff to be used with arbitrary string types (#4536)
e6cafa573 📝 fix CPM.cmake example
e0a17f847 📝 add more package managers (#4533)
20ae363a7 Replace EOF with char_traits (#4532)
589641b17 Add support of multi-dim C-style array member of struct. (#4262)
f385fe28f 💸 update sponsors
981a4c39f 📝 trigger documentation build
dd81f878f 🚀 fix permissions
549c79ba7 Overwork documentation (#4516)
9f60e8555 Fix return value of get_ptr for unsigned integers (#4525)
a006a7a48 Add more GCC warning flags (#4524)
1b9a9d1f2 Update licenses (#4521)
935c6eeb5 Optimize binary `get_number` implementation by reading multiple bytes at once (#4391)
e41905fcb 💸 thanks @phrrngtn
d333f0895 CMake: generate a pkg-config file that follow pkg-config conventions (#4456)
3d6c664de Allow comparing default initialized iterators (#4512)
ee32bfc1c Make SAX output locale-independent (#4505)
a97041a98 Skip enum tests when JSON_DisableEnumSerialization=ON (#4504)
f9f8c0779 fix: integer parsed as float when EINTR set in errno (#4506)
378e09179 Fix weak-vtables warning (#4500)
1f218e107 Possible fix for #4485 (#4487)
64f68dc56 Suppress warnings in NLOHMANN_JSON_SERIALIZE_ENUM (#4497)
1c5923e5d Add comment for #4494 (#4496)
e3ac5a64b Add test for libstdc++ (#4495)
e509007df Remove alwayslink=True Bazel flag (#4396)
060414037 feat: Rebase `feature/optional` to `develop` (#4036)
fd20975a9 Add CPack support (#4459)
fde9a86c5 Make iterator_proxy_value a forward_iterator (#4371) (#4372)
1825117e6 Another desperate try to fix the CI (#4489)
4a602df34 Add lgtm explanation (#4362)
18ff442e6 Allow overriding the CMake target name (#4483)
aff5a31d3 Add NLOHMANN_DEFINE_DERIVED_TYPE_* macros (#4033)
ac8b22180 Update CONTRIBUTING.md (#4486)
632583977 Update is_structured.md (#4472)
b36f4c477 Update natvis to reflect 3.11.3 and the current structure of basic_json (#4451)
960b763ec Docs: fix typos of 'whether' in `operator_{gt,le,lt}.md` (#4412)
8c391e04f Docs: Fix wrong code usage in the Value access section of `json_pointer.md` (#4255)
01da82eae Fix gdb pretty printer (#4343)
97f0bdaf9 chore: fix some typos in comments (#4345)
c883fb0f1 Fix for incorrect function name in documentation example (#4342)
377c767aa Updated exception handling to catch const reference in out_of_range (#4331)
16b3d841d Fixed an error in the `Custom data source` example. (#4335)
199dea11b #4307 Updated docx to 3.10.5 from 3.10.4 (#4310)
0457de21c Align astyle flags in Makefile with CI (#4277)
c35d260c2 Suppress Clang-Tidy warnings (#4276)
6a064e026 Remove broken link from CONTRIBUTING.md (#4274)
7efe87549 Update json_has_static_rtti.md (#4269)
a259ecc51 Fix `to_json` for enums when the enum has an unsigned underlying type. (#4237)
3780b41dd 💰 update sponsors

git-subtree-dir: external/json
git-subtree-split: 60c48755e3f717eace7830d7bbc0d8f1a5e0cc8a

.github/workflows/ubuntu.yml

@@ -8,7 +8,7 @@ on:
       - release/*
   pull_request:
   workflow_dispatch:
-  
+
 permissions:
   contents: read
 
@@ -23,9 +23,9 @@ jobs:
     steps:
       - name: Install git and unzip
         run: apt-get update ; apt-get install -y git unzip
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Get latest CMake and ninja
-        uses: lukka/get-cmake@v3.27.7
+        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
@@ -33,36 +33,54 @@ jobs:
 
   ci_test_gcc:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: gcc:latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
         run: cmake --build build --target ci_test_gcc
 
-  ci_static_analysis:
+  ci_infer:
     runs-on: ubuntu-latest
     container: ghcr.io/nlohmann/json-ci:v2.4.0
-    strategy:
-      matrix:
-        target: [ci_cppcheck, ci_test_valgrind, ci_test_amalgamation, ci_test_single_header, ci_single_binaries, ci_infer]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
-        run: cmake --build build --target ${{ matrix.target }}
+        run: cmake --build build --target ci_infer
+
+  ci_test_single_header:
+    runs-on: ubuntu-latest
+    container: gcc:latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_single_header
 
   ci_static_analysis_ubuntu:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [ci_cpplint, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata]
+        target: [ci_test_amalgamation, ci_cppcheck, ci_cpplint, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata, ci_reuse_compliance, ci_test_valgrind]
     steps:
-      - uses: actions/checkout@v3
+      - name: Harden Runner
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+        with:
+          egress-policy: audit
+
+      - name: Install Valgrind
+        run: sudo apt-get update ; sudo apt-get install -y valgrind
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Get latest CMake and ninja
-        uses: lukka/get-cmake@v3.27.7
+        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
@@ -73,13 +91,13 @@ jobs:
     container: silkeh/clang:dev
     strategy:
       matrix:
-        target: [ci_clang_tidy, ci_test_clang_sanitizer, ci_clang_analyze]
+        target: [ci_clang_tidy, ci_test_clang_sanitizer, ci_clang_analyze, ci_single_binaries]
     steps:
       - name: Install git, clang-tools, and unzip
-        run: apt-get update ; apt-get install -y git clang-tools unzip
-      - uses: actions/checkout@v3
+        run: apt-get update ; apt-get install -y git clang-tools iwyu unzip
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Get latest CMake and ninja
-        uses: lukka/get-cmake@v3.27.7
+        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
@@ -90,13 +108,13 @@ jobs:
     container: ubuntu:focal
     strategy:
       matrix:
-        target: [ci_cmake_flags, ci_test_diagnostics, ci_test_noexceptions, ci_test_noimplicitconversions, ci_test_legacycomparison, ci_test_noglobaludls]
+        target: [ci_cmake_flags, ci_test_diagnostics, ci_test_diagnostic_positions, ci_test_noexceptions, ci_test_noimplicitconversions, ci_test_legacycomparison, ci_test_noglobaludls]
     steps:
       - name: Install build-essential
         run: apt-get update ; apt-get install -y build-essential unzip wget git
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Get latest CMake and ninja
-        uses: lukka/get-cmake@v3.27.7
+        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
@@ -104,37 +122,59 @@ jobs:
 
   ci_test_coverage:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
-    permissions:
-      contents: read
-      checks: write
     steps:
-      - uses: actions/checkout@v3
+      - name: Harden Runner
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Install dependencies and de_DE locale
+        run: |
+          sudo apt-get clean
+          sudo apt-get update
+          sudo apt-get install -y build-essential cmake lcov ninja-build make locales gcc-multilib g++-multilib
+          sudo locale-gen de_DE
+          sudo update-locale
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
         run: cmake --build build --target ci_test_coverage
       - name: Archive coverage report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: code-coverage-report
           path: ${{ github.workspace }}/build/html
       - name: Publish report to Coveralls
-        uses: coverallsapp/github-action@master
+        uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 # v2.3.4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: ${{ github.workspace }}/build/json.info.filtered.noexcept
 
+  ci_test_compilers_gcc_old:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        compiler: ['4.8', '4.9', '5', '6']
+    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Run CMake
+        run: CXX=g++-${{ matrix.compiler }} cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_compiler_g++-${{ matrix.compiler }}
+
   ci_test_compilers_gcc:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        compiler: ['4', '5', '6', '7', '8', '9', '10', '11', '12', 'latest']
+        # older GCC docker images (4, 5, 6) fail to check out code
+        compiler: ['7', '8', '9', '10', '11', '12', '13', '14', 'latest']
     container: gcc:${{ matrix.compiler }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Get latest CMake and ninja
-        uses: lukka/get-cmake@v3.27.7
+        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
@@ -144,14 +184,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        compiler: ['3.5', '3.6', '3.7', '3.8', '3.9', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15-bullseye', 'latest']
+        compiler: ['3.5', '3.6', '3.7', '3.8', '3.9', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15-bullseye', '16', '17', '18', '19', 'latest']
     container: silkeh/clang:${{ matrix.compiler }}
     steps:
       - name: Install unzip and git
         run: apt-get update ; apt-get install -y unzip git
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Get latest CMake and ninja
-        uses: lukka/get-cmake@v3.27.7
+        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
       - name: Set env FORCE_STDCPPFS_FLAG for clang 7 / 8 / 9 / 10
         run: echo "JSON_FORCED_GLOBAL_COMPILE_OPTIONS=-DJSON_HAS_FILESYSTEM=0;-DJSON_HAS_EXPERIMENTAL_FILESYSTEM=0" >> "$GITHUB_ENV"
         if: ${{ matrix.compiler == '7' || matrix.compiler == '8' || matrix.compiler == '9' || matrix.compiler == '10' }}
@@ -160,27 +200,16 @@ jobs:
       - name: Build
         run: cmake --build build --target ci_test_compiler_default
 
-  ci_test_compilers:
-    runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
-    strategy:
-      matrix:
-        compiler: [g++-4.8]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run CMake
-        run: cmake -S . -B build -DJSON_CI=On
-      - name: Build
-        run: cmake --build build --target ci_test_compiler_${{ matrix.compiler }}
-
   ci_test_standards_gcc:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: gcc:latest
     strategy:
       matrix:
         standard: [11, 14, 17, 20, 23]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
@@ -192,22 +221,27 @@ jobs:
     strategy:
       matrix:
         standard: [11, 14, 17, 20, 23]
+        stdlib: [libcxx, libstdcxx]
     steps:
       - name: Install git and unzip
         run: apt-get update ; apt-get install -y git unzip
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Get latest CMake and ninja
-        uses: lukka/get-cmake@v3.27.7
+        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
-      - name: Build
+      - name: Build with libc++
+        run: cmake --build build --target ci_test_clang_libcxx_cxx${{ matrix.standard }}
+        if: ${{ matrix.stdlib == 'libcxx' }}
+      - name: Build with libstdc++
         run: cmake --build build --target ci_test_clang_cxx${{ matrix.standard }}
+        if: ${{ matrix.stdlib == 'libstdcxx' }}
 
   ci_cuda_example:
     runs-on: ubuntu-latest
     container: ghcr.io/nlohmann/json-ci:v2.4.0
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
@@ -217,7 +251,7 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/nlohmann/json-ci:v2.2.0
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
@@ -225,23 +259,18 @@ jobs:
           . /opt/intel/oneapi/setvars.sh
           cmake --build build --target ci_icpc
 
-  ci_reuse_compliance:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
-      - name: Install REUSE tool
-        run:  python -m pip install reuse
-      - name: Run REUSE lint
-        run: reuse lint
-
   ci_test_documentation:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [ci_test_examples, ci_test_api_documentation]
+        target: [ci_test_examples, ci_test_build_documentation]
     steps:
-      - uses: actions/checkout@v3
+      - name: Harden Runner
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build