Merge pull request #7654 from shawnxie999/ct-latest-dev

merge with latest develop

.clang-tidy

@@ -1,72 +1,158 @@
 ---
 Checks: "-*,
   bugprone-*,
+  -bugprone-assignment-in-if-condition,
+  -bugprone-bitwise-pointer-cast,
+  -bugprone-branch-clone,
+  -bugprone-command-processor,
+  -bugprone-copy-constructor-mutates-argument,
+  -bugprone-default-operator-new-on-overaligned-type,
   -bugprone-easily-swappable-parameters,
+  -bugprone-exception-copy-constructor-throws,
   -bugprone-exception-escape,
+  -bugprone-float-loop-counter,
+  -bugprone-forwarding-reference-overload,
   -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-incorrect-enable-shared-from-this,
   -bugprone-narrowing-conversions,
+  -bugprone-nondeterministic-pointer-iteration-order,
+  -bugprone-not-null-terminated-result,
+  -bugprone-random-generator-seed,
+  -bugprone-raw-memory-call-on-non-trivial-type,
+  -bugprone-std-namespace-modification,
+  -bugprone-tagged-union-member-count,
   -bugprone-throwing-static-initialization,
+  -bugprone-unchecked-string-to-number-conversion,
+  -bugprone-unintended-char-ostream-output,
 
   cppcoreguidelines-*,
   -cppcoreguidelines-avoid-c-arrays,
+  -cppcoreguidelines-avoid-capturing-lambda-coroutines,
   -cppcoreguidelines-avoid-const-or-ref-data-members,
   -cppcoreguidelines-avoid-do-while,
+  -cppcoreguidelines-avoid-goto,
   -cppcoreguidelines-avoid-magic-numbers,
   -cppcoreguidelines-avoid-non-const-global-variables,
+  -cppcoreguidelines-avoid-reference-coroutine-parameters,
   -cppcoreguidelines-c-copy-assignment-signature,
+  -cppcoreguidelines-explicit-virtual-functions,
   -cppcoreguidelines-interfaces-global-init,
+  -cppcoreguidelines-macro-to-enum,
   -cppcoreguidelines-macro-usage,
   -cppcoreguidelines-missing-std-forward,
   -cppcoreguidelines-narrowing-conversions,
+  -cppcoreguidelines-no-malloc,
+  -cppcoreguidelines-noexcept-destructor,
   -cppcoreguidelines-noexcept-move-operations,
+  -cppcoreguidelines-noexcept-swap,
   -cppcoreguidelines-non-private-member-variables-in-classes,
   -cppcoreguidelines-owning-memory,
+  -cppcoreguidelines-prefer-member-initializer,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
   -cppcoreguidelines-pro-bounds-avoid-unchecked-container-access,
   -cppcoreguidelines-pro-bounds-constant-array-index,
   -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+  -cppcoreguidelines-pro-type-const-cast,
+  -cppcoreguidelines-pro-type-cstyle-cast,
   -cppcoreguidelines-pro-type-reinterpret-cast,
   -cppcoreguidelines-pro-type-union-access,
+  -cppcoreguidelines-pro-type-vararg,
+  -cppcoreguidelines-slicing,
   -cppcoreguidelines-special-member-functions,
 
   llvm-namespace-comment,
 
   misc-*,
+  -misc-anonymous-namespace-in-header,
+  -misc-confusable-identifiers,
+  -misc-coroutine-hostile-raii,
+  -misc-misleading-bidirectional,
+  -misc-misleading-identifier,
   -misc-multiple-inheritance,
+  -misc-new-delete-overloads,
   -misc-no-recursion,
+  -misc-non-copyable-objects,
   -misc-non-private-member-variables-in-classes,
   -misc-override-with-different-visibility,
+  -misc-predictable-rand,
+  -misc-unconventional-assign-operator,
+  -misc-uniqueptr-reset-release,
   -misc-unused-parameters,
   -misc-use-anonymous-namespace,
   -misc-use-internal-linkage,
 
   modernize-*,
+  -modernize-avoid-bind,
   -modernize-avoid-c-arrays,
   -modernize-avoid-c-style-cast,
+  -modernize-avoid-setjmp-longjmp,
+  -modernize-avoid-variadic-functions,
+  -modernize-deprecated-ios-base-aliases,
+  -modernize-loop-convert,
+  -modernize-macro-to-enum,
+  -modernize-min-max-use-initializer-list,
+  -modernize-raw-string-literal,
+  -modernize-redundant-void-arg,
+  -modernize-replace-auto-ptr,
+  -modernize-replace-disallow-copy-and-assign-macro,
+  -modernize-replace-random-shuffle,
   -modernize-return-braced-init-list,
+  -modernize-shrink-to-fit,
+  -modernize-unary-static-assert,
+  -modernize-use-auto,
+  -modernize-use-bool-literals,
+  -modernize-use-constraints,
+  -modernize-use-default-member-init,
   -modernize-use-integer-sign-comparison,
+  -modernize-use-noexcept,
+  -modernize-use-nullptr,
+  -modernize-use-std-format,
+  -modernize-use-std-print,
   -modernize-use-trailing-return-type,
+  -modernize-use-transparent-functors,
+  -modernize-use-uncaught-exceptions,
 
   performance-*,
   -performance-avoid-endl,
   -performance-enum-size,
+  -performance-inefficient-algorithm,
+  -performance-inefficient-string-concatenation,
+  -performance-no-int-to-ptr,
+  -performance-noexcept-destructor,
   -performance-noexcept-move-constructor,
+  -performance-noexcept-swap,
+  -performance-type-promotion-in-math-fn,
   -performance-unnecessary-copy-initialization,
   -performance-unnecessary-value-param,
 
   readability-*,
   -readability-avoid-const-params-in-decls,
+  -readability-avoid-unconditional-preprocessor-if,
   -readability-container-data-pointer,
+  -readability-delete-null-pointer,
   -readability-function-cognitive-complexity,
+  -readability-function-size,
   -readability-identifier-length,
   -readability-inconsistent-declaration-parameter-name,
   -readability-isolate-declaration,
   -readability-magic-numbers,
+  -readability-misplaced-array-index,
   -readability-named-parameter,
+  -readability-operators-representation,
   -readability-qualified-auto,
   -readability-redundant-access-specifiers,
+  -readability-redundant-control-flow,
+  -readability-redundant-function-ptr-dereference,
+  -readability-redundant-preprocessor,
+  -readability-redundant-smartptr-get,
+  -readability-redundant-string-cstr,
+  -readability-simplify-subscript-expr,
   -readability-static-accessed-through-instance,
-  -readability-uppercase-literal-suffix
+  -readability-string-compare,
+  -readability-uniqueptr-delete-release,
+  -readability-uppercase-literal-suffix,
+  -readability-use-anyofallof,
+  -readability-use-concise-preprocessor-directives
   "
 # ---
 # bugprone-narrowing-conversions,                      # This will break a lot of code but we should enable it in the future because it can eliminate a lot of bugs
@@ -79,7 +165,7 @@ CheckOptions:
   bugprone-unsafe-functions.ReportMoreUnsafeFunctions: true
   bugprone-unused-return-value.CheckedReturnTypes: ::std::error_code;::std::error_condition;::std::errc
 
-  misc-include-cleaner.IgnoreHeaders: ".*/(detail|impl)/.*;.*fwd\\.h(pp)?;time.h;stdlib.h;sqlite3.h;netinet/in\\.h;sys/resource\\.h;sys/sysinfo\\.h;linux/sysinfo\\.h;__chrono/.*;bits/.*;_abort\\.h;boost/.*;openssl/obj_mac\\.h"
+  misc-include-cleaner.IgnoreHeaders: ".*/(detail|impl)/.*;.*fwd\\.h(pp)?;time.h;stdlib.h;sqlite3.h;netinet/in\\.h;sys/resource\\.h;sys/sysinfo\\.h;linux/sysinfo\\.h;__chrono/.*;bits/.*;_abort\\.h;boost/uuid/uuid_hash.hpp;boost/beast/core/flat_buffer\\.hpp;boost/beast/http/field\\.hpp;boost/beast/http/dynamic_body\\.hpp;boost/beast/http/message\\.hpp;boost/beast/http/read\\.hpp;boost/beast/http/write\\.hpp;openssl/obj_mac\\.h"
 
   readability-braces-around-statements.ShortStatementLines: 2
   readability-identifier-naming.MacroDefinitionCase: UPPER_CASE

.envrc

@@ -1 +0,0 @@
-use flake

.gersemi/definitions.cmake

@@ -48,12 +48,6 @@ endfunction()
 function(add_module parent name)
 endfunction()
 
-function(verify_target_headers target headers_dir)
-endfunction()
-
-function(_verify_add_headers target dir)
-endfunction()
-
 function(setup_protocol_autogen)
 endfunction()
 

.github/scripts/levelization/results/loops.txt

@@ -1,3 +1,9 @@
+Loop: test.jtx test.toplevel
+  test.toplevel > test.jtx
+
+Loop: test.jtx test.unit_test
+  test.unit_test ~= test.jtx
+
 Loop: xrpld.app xrpld.overlay
   xrpld.app > xrpld.overlay
 

.github/scripts/levelization/results/ordering.txt

@@ -72,6 +72,7 @@ test.app > xrpl.server
 test.app > xrpl.shamap
 test.app > xrpl.tx
 test.basics > test.jtx
+test.basics > test.unit_test
 test.basics > xrpl.basics
 test.basics > xrpl.core
 test.basics > xrpld.rpc
@@ -104,9 +105,9 @@ test.csf > xrpl.basics
 test.csf > xrpld.consensus
 test.csf > xrpl.json
 test.csf > xrpl.ledger
+test.csf > xrpl.protocol
 test.json > test.jtx
 test.json > xrpl.json
-test.jtx > test.unit_test
 test.jtx > xrpl.basics
 test.jtx > xrpl.config
 test.jtx > xrpl.core
@@ -159,9 +160,11 @@ test.peerfinder > xrpl.protocol
 test.protocol > test.jtx
 test.protocol > test.unit_test
 test.protocol > xrpl.basics
-test.protocol > xrpld.core
 test.protocol > xrpl.json
 test.protocol > xrpl.protocol
+test.resource > test.unit_test
+test.resource > xrpl.basics
+test.resource > xrpl.resource
 test.rpc > test.jtx
 test.rpc > xrpl.basics
 test.rpc > xrpl.config
@@ -185,6 +188,14 @@ test.server > xrpld.core
 test.server > xrpl.json
 test.server > xrpl.protocol
 test.server > xrpl.server
+test.shamap > test.unit_test
+test.shamap > xrpl.basics
+test.shamap > xrpl.config
+test.shamap > xrpl.nodestore
+test.shamap > xrpl.protocol
+test.shamap > xrpl.shamap
+test.toplevel > test.csf
+test.toplevel > xrpl.json
 test.unit_test > xrpl.basics
 test.unit_test > xrpl.protocol
 tests.libxrpl > xrpl.basics
@@ -196,7 +207,6 @@ tests.libxrpl > xrpl.net
 tests.libxrpl > xrpl.nodestore
 tests.libxrpl > xrpl.protocol
 tests.libxrpl > xrpl.protocol_autogen
-tests.libxrpl > xrpl.resource
 tests.libxrpl > xrpl.server
 tests.libxrpl > xrpl.shamap
 tests.libxrpl > xrpl.tx
@@ -208,14 +218,11 @@ xrpl.core > xrpl.json
 xrpl.core > xrpl.protocol
 xrpl.json > xrpl.basics
 xrpl.ledger > xrpl.basics
-xrpl.ledger > xrpl.json
-xrpl.ledger > xrpl.nodestore
 xrpl.ledger > xrpl.protocol
 xrpl.ledger > xrpl.shamap
 xrpl.net > xrpl.basics
 xrpl.nodestore > xrpl.basics
 xrpl.nodestore > xrpl.config
-xrpl.nodestore > xrpl.json
 xrpl.nodestore > xrpl.protocol
 xrpl.protocol > xrpl.basics
 xrpl.protocol > xrpl.json
@@ -233,6 +240,7 @@ xrpl.server > xrpl.json
 xrpl.server > xrpl.protocol
 xrpl.server > xrpl.rdb
 xrpl.server > xrpl.resource
+xrpl.server > xrpl.shamap
 xrpl.shamap > xrpl.basics
 xrpl.shamap > xrpl.nodestore
 xrpl.shamap > xrpl.protocol
@@ -287,10 +295,8 @@ xrpld.peerfinder > xrpl.rdb
 xrpld.perflog > xrpl.basics
 xrpld.perflog > xrpl.config
 xrpld.perflog > xrpl.core
-xrpld.perflog > xrpld.app
 xrpld.perflog > xrpld.rpc
 xrpld.perflog > xrpl.json
-xrpld.perflog > xrpl.nodestore
 xrpld.perflog > xrpl.protocol
 xrpld.rpc > xrpl.basics
 xrpld.rpc > xrpl.config
@@ -308,6 +314,5 @@ xrpld.rpc > xrpl.shamap
 xrpld.rpc > xrpl.tx
 xrpld.shamap > xrpl.basics
 xrpld.shamap > xrpld.core
-xrpld.shamap > xrpl.nodestore
 xrpld.shamap > xrpl.protocol
 xrpld.shamap > xrpl.shamap

.github/scripts/strategy-matrix/generate.py

@@ -25,16 +25,24 @@ def get_cmake_args(build_type: str, extra_args: str) -> str:
     return " ".join(args)
 
 
+def runs_on_event(exclude_event_types: list[str], event: str | None) -> bool:
+    """Whether a config should run for the current event.
+
+    'exclude_event_types' is a list of GitHub event names (e.g.
+    ["pull_request"]) on which the config should NOT run; an empty list means
+    the config runs on every event. When no event is given (event is None), no
+    filtering is applied.
+    """
+    if event is None:
+        return True
+    return event not in exclude_event_types
+
+
 # ---------------------------------------------------------------------------
 # Input types — shapes of the JSON config files
 # ---------------------------------------------------------------------------
 
 
-# Every config must declare 'minimal'. Minimal configs form the reduced matrix
-# built for pull requests by default; the full matrix adds the rest. Packaging
-# configs declare it too, but packaging is gated in the workflow, not by it.
-
-
 @dataclasses.dataclass
 class LinuxConfig:
     """One entry in linux.json's 'configs' or 'package_configs' arrays."""
@@ -42,11 +50,13 @@ class LinuxConfig:
     compiler: list[str]
     build_type: list[str]
     arch: list[str]
-    minimal: bool
     sanitizers: list[str] = dataclasses.field(default_factory=list)
     suffix: str = ""
     extra_cmake_args: str = ""
     image: str = ""  # only used by package_configs entries
+    # List of GitHub event names (e.g. "pull_request") on which this config
+    # should NOT run. Empty means it runs on every event.
+    exclude_event_types: list[str] = dataclasses.field(default_factory=list)
 
 
 @dataclasses.dataclass
@@ -79,9 +89,11 @@ class PlatformConfig:
     """One entry in macos.json's or windows.json's 'configs' array."""
 
     build_type: list[str]
-    minimal: bool
     build_only: bool = False  # if true, skip tests (e.g. macos/Windows Debug)
     extra_cmake_args: str = ""
+    # List of GitHub event names (e.g. "pull_request") on which this config
+    # should NOT run. Empty means it runs on every event.
+    exclude_event_types: list[str] = dataclasses.field(default_factory=list)
 
     def __post_init__(self) -> None:
         if isinstance(self.build_type, str):
@@ -156,18 +168,20 @@ _ARCHS: dict[str, Architecture] = {
 }
 
 
-def expand_linux_matrix(linux: LinuxFile, minimal: bool) -> list[MatrixEntry]:
+def expand_linux_matrix(
+    linux: LinuxFile, event: str | None = None
+) -> list[MatrixEntry]:
     """Expand a LinuxFile into a flat list of matrix entries.
 
     Each config entry is expanded over the cross-product of its
-    compiler, build_type, sanitizers, and architecture lists. When 'minimal' is
-    true, only configs flagged as minimal are included.
+    compiler, build_type, sanitizers, and architecture lists. Configs that
+    exclude the current event are skipped.
     """
     entries: list[MatrixEntry] = []
 
     for distro, configs in linux.configs.items():
         for cfg in configs:
-            if minimal and not cfg.minimal:
+            if not runs_on_event(cfg.exclude_event_types, event):
                 continue
             # An empty sanitizers list means "one entry with no sanitizer".
             effective_sanitizers = cfg.sanitizers or [""]
@@ -226,17 +240,19 @@ def expand_linux_packaging(linux: LinuxFile) -> list[PackagingEntry]:
     return entries
 
 
-def expand_platform_matrix(pf: PlatformFile, minimal: bool) -> list[MatrixEntry]:
+def expand_platform_matrix(
+    pf: PlatformFile, event: str | None = None
+) -> list[MatrixEntry]:
     """Expand a PlatformFile (macOS or Windows) into matrix entries.
 
-    When 'minimal' is true, only configs flagged as minimal are included.
+    Configs that exclude the current event are skipped.
     """
     platform_name, arch = pf.platform.split("/")
     is_windows = platform_name == "windows"
 
     entries: list[MatrixEntry] = []
     for cfg in pf.configs:
-        if minimal and not cfg.minimal:
+        if not runs_on_event(cfg.exclude_event_types, event):
             continue
         for build_type in cfg.build_type:
             entries.append(
@@ -276,12 +292,12 @@ if __name__ == "__main__":
         action="store_true",
     )
     parser.add_argument(
-        "-m",
-        "--minimal",
-        help="Emit only the minimal matrix (the configs flagged 'minimal'), "
-        "used for pull requests by default. If omitted, the full matrix is "
-        "emitted.",
-        action="store_true",
+        "-e",
+        "--event",
+        help="The GitHub event name that triggered the workflow (e.g. 'push', "
+        "'pull_request'). Configs are filtered by their 'event_type'. If "
+        "omitted, no filtering is applied.",
+        default=None,
     )
     args = parser.parse_args()
 
@@ -292,15 +308,15 @@ if __name__ == "__main__":
     else:
         if args.config in ("linux", None):
             matrix += expand_linux_matrix(
-                LinuxFile.load(THIS_DIR / "linux.json"), args.minimal
+                LinuxFile.load(THIS_DIR / "linux.json"), args.event
             )
         if args.config in ("macos", None):
             matrix += expand_platform_matrix(
-                PlatformFile.load(THIS_DIR / "macos.json"), args.minimal
+                PlatformFile.load(THIS_DIR / "macos.json"), args.event
             )
         if args.config in ("windows", None):
             matrix += expand_platform_matrix(
-                PlatformFile.load(THIS_DIR / "windows.json"), args.minimal
+                PlatformFile.load(THIS_DIR / "windows.json"), args.event
             )
 
     print(f"matrix={json.dumps({'include': [dataclasses.asdict(e) for e in matrix]})}")

.github/scripts/strategy-matrix/linux.json

@@ -2,30 +2,16 @@
   "image_tag": "sha-e29b523",
   "configs": {
     "ubuntu": [
-      {
-        "compiler": ["clang"],
-        "build_type": ["Release"],
-        "arch": ["amd64"],
-        "minimal": true
-      },
-      {
-        "compiler": ["gcc"],
-        "build_type": ["Release"],
-        "arch": ["amd64"],
-        "minimal": false
-      },
       {
         "compiler": ["gcc", "clang"],
         "build_type": ["Debug", "Release"],
-        "arch": ["arm64"],
-        "minimal": false
+        "arch": ["amd64", "arm64"]
       },
 
       {
         "compiler": ["gcc", "clang"],
         "build_type": ["Debug", "Release"],
         "arch": ["amd64"],
-        "minimal": false,
         "sanitizers": ["address", "undefinedbehavior"]
       },
 
@@ -33,7 +19,6 @@
         "compiler": ["gcc"],
         "build_type": ["Debug"],
         "arch": ["amd64"],
-        "minimal": true,
         "suffix": "coverage",
         "extra_cmake_args": "-DUNIT_TEST_REFERENCE_FEE=500 -Dcoverage=ON -Dcoverage_format=xml -DCODE_COVERAGE_VERBOSE=ON -DCMAKE_C_FLAGS=-O0 -DCMAKE_CXX_FLAGS=-O0"
       },
@@ -41,7 +26,6 @@
         "compiler": ["clang"],
         "build_type": ["Debug"],
         "arch": ["amd64"],
-        "minimal": false,
         "suffix": "voidstar",
         "extra_cmake_args": "-Dvoidstar=ON"
       },
@@ -49,7 +33,6 @@
         "compiler": ["clang"],
         "build_type": ["Release"],
         "arch": ["amd64"],
-        "minimal": false,
         "suffix": "reffee",
         "extra_cmake_args": "-DUNIT_TEST_REFERENCE_FEE=1000"
       },
@@ -57,9 +40,9 @@
         "compiler": ["gcc"],
         "build_type": ["Debug"],
         "arch": ["amd64"],
-        "minimal": false,
         "suffix": "unity",
-        "extra_cmake_args": "-Dunity=ON"
+        "extra_cmake_args": "-Dunity=ON",
+        "exclude_event_types": ["pull_request"]
       }
     ],
 
@@ -67,8 +50,7 @@
       {
         "compiler": ["gcc"],
         "build_type": ["Release"],
-        "arch": ["amd64"],
-        "minimal": false
+        "arch": ["amd64"]
       }
     ],
 
@@ -76,8 +58,7 @@
       {
         "compiler": ["gcc"],
         "build_type": ["Release"],
-        "arch": ["amd64"],
-        "minimal": false
+        "arch": ["amd64"]
       }
     ]
   },
@@ -87,7 +68,6 @@
         "compiler": ["gcc"],
         "build_type": ["Release"],
         "arch": ["amd64"],
-        "minimal": false,
         "image": "ghcr.io/xrplf/xrpld/packaging-debian:sha-577d745"
       }
     ],
@@ -97,7 +77,6 @@
         "compiler": ["gcc"],
         "build_type": ["Release"],
         "arch": ["amd64"],
-        "minimal": false,
         "image": "ghcr.io/xrplf/xrpld/packaging-rhel:sha-577d745"
       }
     ]

.github/scripts/strategy-matrix/macos.json

@@ -1,17 +1,16 @@
 {
   "platform": "macos/arm64",
-  "runner": ["self-hosted", "macOS", "ARM64", "macos-26-apple-clang-21"],
+  "runner": ["self-hosted", "macOS", "ARM64", "mac-runner-m1"],
   "configs": [
     {
       "build_type": "Release",
-      "extra_cmake_args": "-DCMAKE_POLICY_VERSION_MINIMUM=3.5",
-      "minimal": true
+      "extra_cmake_args": "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
     },
     {
       "build_type": "Debug",
       "extra_cmake_args": "-DCMAKE_POLICY_VERSION_MINIMUM=3.5",
       "build_only": true,
-      "minimal": false
+      "exclude_event_types": ["pull_request"]
     }
   ]
 }

.github/scripts/strategy-matrix/windows.json

@@ -2,11 +2,11 @@
   "platform": "windows/amd64",
   "runner": ["self-hosted", "Windows", "dev-box-windows-2026"],
   "configs": [
-    { "build_type": "Release", "minimal": true },
+    { "build_type": "Release" },
     {
       "build_type": "Debug",
       "build_only": true,
-      "minimal": false
+      "exclude_event_types": ["pull_request"]
     }
   ]
 }

.github/workflows/conflicting-pr.yml

@@ -14,7 +14,6 @@ permissions:
 
 jobs:
   main:
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'IgnoreConflicts') }}
     runs-on: ubuntu-latest
     steps:
       - name: Check if PRs are dirty

.github/workflows/on-pr.yml

@@ -1,11 +1,7 @@
-# This workflow runs workflows to check, build and test the project
-# on every meaningful change on pull_request.
-# However, it will not run if the PR is a draft
-# unless it has the 'DraftRunCI' or 'Full CI build' label.
-#
-# By default a PR builds only a minimal matrix.
-# The full matrix runs once the PR is labeled "Ready to merge" or "Full CI build".
-# For commits to PRs that target a release branch,
+# This workflow runs all workflows to check, build and test the project on
+# various Linux flavors, as well as on MacOS and Windows, on every push to a
+# user branch. However, it will not run if the pull request is a draft unless it
+# has the 'DraftRunCI' label. For commits to PRs that target a release branch,
 # it also uploads the libxrpl recipe to the Conan remote.
 name: PR
 
@@ -19,16 +15,8 @@ on:
       - reopened
       - synchronize
       - ready_for_review
-      # Trigger on label changes so toggling "Ready to merge" or "Full CI build"
-      # switches between the minimal and full matrix without needing a new push.
-      - labeled
-      - unlabeled
 
 concurrency:
-  # A single per-ref group with cancel-in-progress means any newer run (a push
-  # or a label change) supersedes the in-progress one for that ref. Keeping
-  # exactly one authoritative run per ref ensures a fast do-nothing run can never
-  # mask a real build's checks.
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
@@ -37,18 +25,11 @@ defaults:
     shell: bash
 
 jobs:
-  # This job determines whether the rest of the workflow should run at all,
-  # based on the current set of labels: it runs when the PR is not a draft
-  # (which should also cover merge-group) or has the 'DraftRunCI' or
-  # 'Full CI build' label. Whether a build then happens, and whether it is the
-  # minimal or full matrix, is decided further below and in the strategy matrix.
+  # This job determines whether the rest of the workflow should run. It runs
+  # when the PR is not a draft (which should also cover merge-group) or
+  # has the 'DraftRunCI' label.
   should-run:
-    if: >-
-      ${{
-        !github.event.pull_request.draft
-        || contains(github.event.pull_request.labels.*.name, 'DraftRunCI')
-        || contains(github.event.pull_request.labels.*.name, 'Full CI build')
-      }}
+    if: ${{ !github.event.pull_request.draft || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -110,17 +91,15 @@ jobs:
         # least one of:
         # * Any of the files checked in the `changes` step were modified
         # * The PR is NOT a draft and is labeled "Ready to merge"
-        # * The PR is labeled "Full CI build" (draft or not)
         # * The workflow is running from the merge queue
         id: go
         env:
           FILES: ${{ steps.changes.outputs.any_changed }}
           DRAFT: ${{ github.event.pull_request.draft }}
           READY: ${{ contains(github.event.pull_request.labels.*.name, 'Ready to merge') }}
-          FULL: ${{ contains(github.event.pull_request.labels.*.name, 'Full CI build') }}
           MERGE: ${{ github.event_name == 'merge_group' }}
         run: |
-          echo "go=${{ (env.DRAFT != 'true' && env.READY == 'true') || env.FULL == 'true' || env.FILES == 'true' || env.MERGE == 'true' }}" >>"${GITHUB_OUTPUT}"
+          echo "go=${{ (env.DRAFT != 'true' && env.READY == 'true') || env.FILES == 'true' || env.MERGE == 'true' }}" >>"${GITHUB_OUTPUT}"
           cat "${GITHUB_OUTPUT}"
     outputs:
       go: ${{ steps.go.outputs.go == 'true' }}
@@ -163,10 +142,7 @@ jobs:
 
   package:
     needs: [should-run, build-test]
-    # Packaging consumes the debian/rhel release binaries, which are only built
-    # by the full matrix. Skip it for pull requests that ran only the minimal
-    # matrix (i.e. not yet labeled "Ready to merge" or "Full CI build").
-    if: ${{ needs.should-run.outputs.go == 'true' && (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'Ready to merge') || contains(github.event.pull_request.labels.*.name, 'Full CI build')) }}
+    if: ${{ needs.should-run.outputs.go == 'true' }}
     uses: ./.github/workflows/reusable-package.yml
 
   upload-recipe:

.github/workflows/pre-commit.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   # Call the workflow in the XRPLF/actions repo that runs the pre-commit hooks.
   run-hooks:
-    uses: XRPLF/actions/.github/workflows/pre-commit.yml@1bde119a1ab71305ba5d3716e7a82cea1c7bdede
+    uses: XRPLF/actions/.github/workflows/pre-commit.yml@e06d4138c9ec8dceeb7c818645faa38087ea9e3d
     with:
       runs_on: ubuntu-latest
       container: '{ "image": "ghcr.io/xrplf/ci/tools-rippled-pre-commit:sha-41ec7c1" }'

.github/workflows/publish-docs.yml

@@ -47,7 +47,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@64ec3cf3b152b4444638f470bbd6df7a7a30c81c
+        uses: XRPLF/actions/prepare-runner@c47daebb2f9db64ffbac71b47d68a661498d5ce8
         with:
           enable_ccache: false
 

.github/workflows/reusable-build-test-config.yml

@@ -113,7 +113,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@64ec3cf3b152b4444638f470bbd6df7a7a30c81c
+        uses: XRPLF/actions/prepare-runner@c47daebb2f9db64ffbac71b47d68a661498d5ce8
         with:
           enable_ccache: ${{ inputs.ccache_enabled }}
 
@@ -124,7 +124,7 @@ jobs:
       - name: Check tools
         env:
           CHECK_TOOLS_SKIP_CLONE: "1"
-        run: ./bin/check-tools.sh || true
+        run: ./bin/check-tools.sh
 
       - name: Print build environment
         uses: XRPLF/actions/print-build-env@59dec886e4afb05a1724443af08baccbc045b574

.github/workflows/reusable-clang-tidy.yml

@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@64ec3cf3b152b4444638f470bbd6df7a7a30c81c
+        uses: XRPLF/actions/prepare-runner@c47daebb2f9db64ffbac71b47d68a661498d5ce8
         with:
           enable_ccache: false
 
@@ -79,7 +79,6 @@ jobs:
               -Dtests=ON \
               -Dwerr=ON \
               -Dxrpld=ON \
-              -Dverify_headers=ON \
               ..
 
       # clang-tidy needs headers generated from proto files
@@ -92,15 +91,15 @@ jobs:
         id: run_clang_tidy
         continue-on-error: true
         env:
-          TARGETS: ${{ needs.determine-files.outputs.need_full_run != 'true' && needs.determine-files.outputs.cpp_changed_files || 'include src tests' }}
+          TARGETS: ${{ needs.determine-files.outputs.need_full_run != 'true' && needs.determine-files.outputs.cpp_changed_files || 'src tests' }}
         run: |
           set -o pipefail
           run-clang-tidy -j ${{ steps.nproc.outputs.nproc }} -p "${BUILD_DIR}" -quiet -fix -allow-no-checks ${TARGETS} 2>&1 | tee "${OUTPUT_FILE}"
 
-      - name: Print filtered clang-tidy errors
+      - name: Print errors
         if: ${{ steps.run_clang_tidy.outcome != 'success' }}
         run: |
-          bin/filter-clang-tidy.py "${OUTPUT_FILE}"
+          sed '/error\||/!d' "${OUTPUT_FILE}"
 
       - name: Upload clang-tidy output
         if: ${{ github.event.repository.visibility == 'public' && steps.run_clang_tidy.outcome != 'success' }}
@@ -144,12 +143,12 @@ jobs:
           \`\`\`
           EOF
 
-      - name: Append filtered clang-tidy output to issue body
+      - name: Append clang-tidy output to issue body (filter for errors and warnings)
         if: ${{ steps.run_clang_tidy.outcome != 'success' }}
         run: |
           if [ -f "${OUTPUT_FILE}" ]; then
-              # Filter to the unique errors with their source context.
-              bin/filter-clang-tidy.py "${OUTPUT_FILE}" >"${FILTERED_OUTPUT_FILE}" || true
+              # Extract lines containing 'error:', 'warning:', or 'note:'
+              grep -E '(error:|warning:|note:)' "${OUTPUT_FILE}" >"${FILTERED_OUTPUT_FILE}" || true
 
               # If filtered output is empty, use original (might be a different error format)
               if [ ! -s "${FILTERED_OUTPUT_FILE}" ]; then

.github/workflows/reusable-package.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: "3.13"
 

.github/workflows/reusable-strategy-matrix.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: "3.13"
 
@@ -35,8 +35,5 @@ jobs:
         id: generate
         env:
           GENERATE_CONFIG: ${{ inputs.os != '' && format('--config={0}', inputs.os) || '' }}
-          # Run only the minimal matrix for pull requests that are not yet
-          # labeled "Ready to merge" or "Full CI build". Any other event (merge
-          # queue, push, schedule, manual dispatch) runs the full matrix.
-          GENERATE_MINIMAL: ${{ (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'Ready to merge') && !contains(github.event.pull_request.labels.*.name, 'Full CI build')) && '--minimal' || '' }}
-        run: ./generate.py ${GENERATE_CONFIG} ${GENERATE_MINIMAL} >>"${GITHUB_OUTPUT}"
+          GENERATE_EVENT: ${{ github.event_name }}
+        run: ./generate.py ${GENERATE_CONFIG} --event="${GENERATE_EVENT}" >>"${GITHUB_OUTPUT}"

.github/workflows/upload-conan-deps.yml

@@ -68,7 +68,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Prepare runner
-        uses: XRPLF/actions/prepare-runner@64ec3cf3b152b4444638f470bbd6df7a7a30c81c
+        uses: XRPLF/actions/prepare-runner@c47daebb2f9db64ffbac71b47d68a661498d5ce8
         with:
           enable_ccache: false
 

.pre-commit-config.yaml

@@ -28,15 +28,8 @@ repos:
         entry: ./bin/pre-commit/clang_tidy_check.py
         language: python
         types_or: [c++, c]
-        # .ipp fragments are included by their owning header rather than compiled
-        # as standalone translation units, so they have no compile_commands.json
-        # entry to lint (verify_headers checks them transitively).
-        exclude: '^include/xrpl/protocol_autogen|\.ipp$'
-        # run-clang-tidy --fix may edit headers included by files it is not run on,
-        # so pre-commit must not split the files across parallel hook invocations.
-        # The script determines the staged files itself and lets run-clang-tidy
-        # handle parallelism internally.
-        pass_filenames: false
+        exclude: ^include/xrpl/protocol_autogen
+        pass_filenames: false # script determines the staged files itself
       - id: fix-include-style
         name: fix include style
         entry: ./bin/pre-commit/fix_include_style.py
@@ -48,11 +41,6 @@ repos:
         language: python
         entry: ./bin/pre-commit/fix_pragma_once.py
         files: \.(h|hpp)$
-      - id: check-doxygen-style
-        name: check Doxygen comment style
-        entry: ./bin/pre-commit/check_doxygen_style.py
-        language: python
-        types_or: [c++, c]
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: dd18dad857d6133e90bbe478f4f2f22ec0030269 # frozen: v22.1.5
@@ -63,12 +51,12 @@ repos:
         exclude: ^include/xrpl/protocol_autogen/(transactions|ledger_entries)/
 
   - repo: https://github.com/BlankSpruce/gersemi-pre-commit
-    rev: e98930bdc210d3387007f9252d8c1694ea7e410f # frozen: 0.27.7
+    rev: faadd6a9d852369ca94f4d15b2404c967ba8cb01 # frozen: 0.27.6
     hooks:
       - id: gersemi
 
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: 39e2973981e6d2f9b6c543b0086a2d2393abdc89 # frozen: v3.9.4
+    rev: 515f543f5718ebfd6ce22e16708bb32c68ff96e1 # frozen: v3.8.3
     hooks:
       - id: prettier
         args: [--end-of-line=auto]
@@ -98,21 +86,22 @@ repos:
         files: \.md$
 
   - repo: https://github.com/streetsidesoftware/cspell-cli
-    rev: ea11f9efc0bec520073405bc30552da887ba71bc # frozen: v10.0.1
+    rev: 4643f154907327ee0a2c7038f0296e0dd77d9776 # frozen: v10.0.0
     hooks:
-      - id: cspell
-        name: check changed files spelling
+      - id: cspell # Spell check changed files
         exclude: |
           (?x)^(
-              \.cspell\.config\.yaml|
+              .config/cspell.config.yaml|
               include/xrpl/protocol_autogen/(transactions|ledger_entries)/.*
           )$
-      - id: cspell
+      - id: cspell # Spell check the commit message
         name: check commit message spelling
         args:
           - --no-must-find-files
           - --no-progress
           - --no-summary
+          - --files
+          - .git/COMMIT_EDITMSG
         stages: [commit-msg]
 
   - repo: local

API-CHANGELOG.md

@@ -28,9 +28,6 @@ This section contains changes targeting a future version.
 
 ### Additions
 
-- `account_tx`: Added an optional `delegate` request object to filter delegated transactions. The object requires `delegate_filter`, which must be either `actor` for transactions owned by the requested account but signed by another account, or `authorizer` for transactions signed by the requested account on behalf of another account. The optional `counter_party` account narrows the results to a specific signer/delegate for `actor` or a specific owner/delegator for `authorizer`. Malformed `delegate`, `delegate_filter`, and `counter_party` values return standard invalid field errors, and invalid account IDs return `actMalformed`.
-  When paginating delegate-filtered queries, a marker from a delegate-filtered query includes a `delegate` flag and is only valid for follow-up requests that also supply `delegate` (mixing marker conventions returns `invalidParams`). Because filtering is applied after the ledger scan, a page may contain fewer results than `limit` (possibly zero) while still returning a marker, so callers must continue until no marker is present.
-
 - `ledger_entry`, `account_objects`: The `Delegate` ledger entry now includes an optional `DestinationNode` field, which stores the index into the authorized account's owner directory. This field is present on entries created after bidirectional directory tracking was introduced and may appear in RPC responses for those entries. ([#6681](https://github.com/XRPLF/rippled/pull/6681))
 
 - `server_definitions`: Added the following new sections to the response ([#6321](https://github.com/XRPLF/rippled/pull/6321)):

BUILD.md

@@ -25,7 +25,7 @@ You can verify that the required tools are installed and runnable with:
 | ----------- | --------------- |
 | GCC         | 15.2            |
 | Clang       | 22              |
-| Apple Clang | 21              |
+| Apple Clang | 17              |
 | MSVC        | 19.44[^windows] |
 
 ## Operating Systems
@@ -317,41 +317,21 @@ See [Sanitizers docs](./docs/build/sanitizers.md) for more details.
 
 ## Options
 
-| Option           | Default Value | Description                                                                   |
-| ---------------- | ------------- | ----------------------------------------------------------------------------- |
-| `assert`         | OFF           | Force enabling assertions.                                                    |
-| `coverage`       | OFF           | Prepare the coverage report.                                                  |
-| `tests`          | OFF           | Build tests.                                                                  |
-| `unity`          | OFF           | Configure a unity build.                                                      |
-| `verify_headers` | ON            | Make the `verify-headers` target available to compile each header on its own. |
-| `xrpld`          | OFF           | Build the xrpld application, and not just the libxrpl library.                |
-| `werr`           | OFF           | Treat compilation warnings as errors                                          |
-| `wextra`         | OFF           | Enable additional compilation warnings                                        |
+| Option     | Default Value | Description                                                    |
+| ---------- | ------------- | -------------------------------------------------------------- |
+| `assert`   | OFF           | Force enabling assertions.                                     |
+| `coverage` | OFF           | Prepare the coverage report.                                   |
+| `tests`    | OFF           | Build tests.                                                   |
+| `unity`    | OFF           | Configure a unity build.                                       |
+| `xrpld`    | OFF           | Build the xrpld application, and not just the libxrpl library. |
+| `werr`     | OFF           | Treat compilation warnings as errors                           |
+| `wextra`   | OFF           | Enable additional compilation warnings                         |
 
 [Unity builds][unity-build] may be faster for the first build (at the cost of much more
 memory) since they concatenate sources into fewer translation units. Non-unity
 builds may be faster for incremental builds, and can be helpful for detecting
 `#include` omissions.
 
-### Verifying headers
-
-The regular build only compiles `.cpp` files, so a header is only ever checked
-through whatever translation unit happens to include it. A header that forgets
-an `#include` is not caught as long as every `.cpp` that uses it includes its
-missing dependency first. The `verify_headers` option (ON by default) adds a
-`verify-headers` target that compiles every header on its own, which fails if a
-header is not self-contained:
-
-```bash
-cmake --build . --target verify-headers
-```
-
-The per-header objects are excluded from the `all` target, so a normal build
-never compiles them; they are built only through `verify-headers`. The generated
-translation units do appear in `compile_commands.json`, so clang-tidy (and
-clangd and IDEs) can lint each header on its own. Pass `-Dverify_headers=OFF` to
-omit them entirely.
-
 ## Troubleshooting
 
 ### Conan

CONTRIBUTING.md

@@ -84,9 +84,7 @@ If you create new source files, they must be organized as follows:
 - All other non-test files must go under `src/xrpld`.
 - All test source files must go under `src/test`.
 
-The source must be formatted according to the style guide below. The easiest
-way to satisfy this is to install the [`pre-commit`](#pre-commit-hooks) hooks,
-which format and lint your changes automatically on every commit.
+The source must be formatted according to the style guide below.
 
 Header includes must be [levelized](.github/scripts/levelization).
 
@@ -214,61 +212,13 @@ This is a non-exhaustive list of recommended style guidelines. These are
 not always strictly enforced and serve as a way to keep the codebase
 coherent rather than a set of _thou shalt not_ commandments.
 
-## Pre-commit hooks
-
-We use the [`pre-commit`](https://pre-commit.com/) framework to run the
-formatting and linting tools that keep the codebase consistent. `pre-commit`
-runs each tool configured in
-[`.pre-commit-config.yaml`](./.pre-commit-config.yaml) in its own isolated
-environment, so you don't need to install most of the individual tools
-yourself. The version of each hook sourced from an external repository
-(`clang-format`, `gersemi`, etc.) is pinned in that file, so running the hooks
-locally uses exactly the same versions as CI. A few `local` hooks — most notably
-`clang-tidy` — run tools from your own environment; see
-[Installing clang-tidy](#installing-clang-tidy) for how to get those.
-
-To get started, install `pre-commit` and enable the git hook scripts:
-
-```bash
-pip install pre-commit
-pre-commit install
-```
-
-Once installed, the hooks run automatically on your staged files every time you
-`git commit`. You can also run them on demand:
-
-```bash
-# Run all hooks against only the staged files
-pre-commit run
-
-# Run all hooks against every file in the repository
-pre-commit run --all-files
-
-# Run a single hook (e.g. clang-format) against all files
-pre-commit run clang-format --all-files
-```
-
-The hooks configured in this repository include, among others:
-
-- `clang-format` — C++/proto formatting (see [Formatting](#formatting))
-- `clang-tidy` — C++ static analysis (see [Clang-tidy](#clang-tidy)); opt in with `TIDY=1`
-- `fix-include-style`, `fix-pragma-once`, `check-doxygen-style` — C++ hygiene
-- `gersemi` — CMake formatting
-- `prettier`, `black`, `shfmt` — formatting for JavaScript/JSON/Markdown, Python, and shell
-- `cspell` — spell checking
-
-The same hooks run in CI on every pull request, so running them locally before
-you push helps you avoid CI failures.
-
 ## Formatting
 
-All code must conform to `clang-format`, according to the settings in
-[`.clang-format`](./.clang-format), unless the result would be unreasonably
-difficult to read or maintain. The `clang-format` version is pinned in
-[`.pre-commit-config.yaml`](./.pre-commit-config.yaml), so the
-[`pre-commit`](#pre-commit-hooks) hook always formats with the same version as
-CI. To demarcate lines that should be left as-is, surround them with comments
-like this:
+All code must conform to `clang-format` version 22,
+according to the settings in [`.clang-format`](./.clang-format),
+unless the result would be unreasonably difficult to read or maintain.
+To demarcate lines that should be left as-is, surround them with comments like
+this:
 
 ```
 // clang-format off
@@ -276,21 +226,9 @@ like this:
 // clang-format on
 ```
 
-The easiest way to format your changes is to let the `pre-commit` hook run
-automatically on commit, or to run it manually:
-
-```bash
-pre-commit run clang-format --all-files
-```
-
-You can also format individual files in place by running `clang-format -i <file>...`
+You can format individual files in place by running `clang-format -i <file>...`
 from any directory within this project.
 
-> [!NOTE]
-> This uses whatever `clang-format` version is installed locally, which may
-> differ from the pinned version used by `pre-commit` and CI, so the results
-> can vary.
-
 There is a Continuous Integration job that runs clang-format on pull requests. If the code doesn't comply, a patch file that corrects auto-fixable formatting issues is generated.
 
 To download the patch file:
@@ -301,6 +239,13 @@ To download the patch file:
 4. Download the zip file and extract it to your local git repository. Run `git apply [patch-file-name]`.
 5. Commit and push.
 
+You can install a pre-commit hook to automatically run `clang-format` before every commit:
+
+```
+pip3 install pre-commit
+pre-commit install
+```
+
 ## Clang-tidy
 
 All code must pass `clang-tidy` checks according to the settings in [`.clang-tidy`](./.clang-tidy).
@@ -322,7 +267,7 @@ Before running clang-tidy, you must build the project to generate required files
 
 #### Via pre-commit (recommended)
 
-If you have already installed the [`pre-commit`](#pre-commit-hooks) hooks, you can run clang-tidy on your staged files using:
+If you have already installed the pre-commit hooks (see above), you can run clang-tidy on your staged files using:
 
 ```
 TIDY=1 pre-commit run clang-tidy

bin/check-tools.sh

@@ -110,23 +110,6 @@ if [ "${os}" = "linux" ] || [ "${os}" = "macos" ]; then
     fi
 fi
 
-# Rust toolchain. Part of the Nix commonPackages, so available on both Linux
-# and macOS. The cargo plugins are invoked through cargo (`cargo <sub>`), which
-# resolves the matching `cargo-<sub>` binary on PATH; `--version` is offline and
-# does not need a Cargo project.
-if [ "${os}" = "linux" ] || [ "${os}" = "macos" ]; then
-    echo
-    echo "Rust toolchain:"
-    check cargo
-    check cargo-audit cargo audit --version
-    check cargo-llvm-cov cargo llvm-cov --version
-    check cargo-nextest cargo nextest --version
-    check clippy clippy-driver --version
-    check rust-analyzer
-    check rustc
-    check rustfmt
-fi
-
 # GCC is the default compiler on Linux. macOS uses the system Apple Clang
 # instead, so GCC/g++/gcov are not expected there.
 if [ "${os}" = "linux" ]; then

bin/filter-clang-tidy.py

@@ -1,102 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Reduce run-clang-tidy output to its unique errors.
-
-It does two things:
-
-  1. Filters the raw output down to diagnostics and their source-context lines
-     (the indented "  103 | ..." / "      | ^" lines clang-tidy prints),
-     matching the "path:line:col: error:" diagnostic shape.
-
-  2. Deduplicates. The same diagnostic in a header is reported once per
-     translation unit that includes it, so identical error blocks are collapsed
-     to their first occurrence.
-
-An "error block" is an "error:" line together with the indented context lines
-and any "note:" lines that follow it (up to the next "error:" line). Blocks are
-compared as a whole, so an error stays attached to its own context, and
-first-occurrence order is preserved.
-
-The deduplicated output goes to stdout; a summary of unique error counts per
-check is printed to stderr.
-
-Usage:
-  bin/filter-clang-tidy.py [INPUT_FILE]            # read from file, or
-  run-clang-tidy ... | bin/filter-clang-tidy.py    # read from stdin
-"""
-
-import re
-import sys
-from collections import Counter
-
-# A clang-tidy diagnostic line looks like "path:line:col: error: msg [check]".
-# Matching on that shape (rather than a loose "error" substring) avoids treating
-# progress lines whose paths contain "error" as diagnostics, e.g.
-#   [284/850][0.7s] /nix/.../clang-tidy ... src/.../error.cpp
-DIAG_RE = re.compile(r":\d+:\d+: (?:error|warning|note):")
-ERROR_RE = re.compile(r":\d+:\d+: error:")
-CHECK_RE = re.compile(r" error: .*\[([^\],]+)")
-
-
-def filter_and_dedup(lines: list[str]) -> list[str]:
-    """Keep diagnostics with their context, then drop duplicate error blocks."""
-    blocks: list[str] = []
-    seen: set[str] = set()
-    current: list[str] = []
-
-    def flush() -> None:
-        if not current:
-            return
-        block = "".join(current)
-        if block not in seen:
-            seen.add(block)
-            blocks.append(block)
-
-    for line in lines:
-        # Keep only diagnostics and their indented source-context lines; drop
-        # progress/status output and blank lines.
-        if not (DIAG_RE.search(line) or line[:1] in (" ", "\t")):
-            continue
-        # An "error:" line starts a new block; its context and any following
-        # "note:" lines (and their context) belong to it.
-        if ERROR_RE.search(line):
-            flush()
-            current = []
-        current.append(line)
-    flush()
-
-    return blocks
-
-
-def summarize(blocks: list[str]) -> Counter[str]:
-    """Count unique errors per check name (e.g. "bugprone-branch-clone")."""
-    counts: Counter[str] = Counter()
-    for block in blocks:
-        # The error line is the first line of the block.
-        match = CHECK_RE.search(block.splitlines()[0])
-        if match:
-            counts[match.group(1)] += 1
-    return counts
-
-
-def main() -> int:
-    if len(sys.argv) > 1 and sys.argv[1] != "-":
-        with open(sys.argv[1], encoding="utf-8") as f:
-            lines = f.readlines()
-    else:
-        lines = sys.stdin.readlines()
-
-    blocks = filter_and_dedup(lines)
-    # Blank line between blocks so distinct errors are easy to tell apart.
-    sys.stdout.write("\n".join(blocks))
-
-    print("\nUnique errors per check:", file=sys.stderr)
-    for check, count in summarize(blocks).most_common():
-        print(f"{count:>4} {check}", file=sys.stderr)
-
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

bin/pre-commit/check_doxygen_style.py

@@ -1,440 +0,0 @@
-#!/usr/bin/env python3
-"""
-Check C++ Doxygen comment style.
-
-Enforces the house convention for documentation comments:
-
-  * Use ``/** ... */`` blocks, not ``///``, ``//!`` or ``/*! ... */``; a plain
-    ``/* ... */`` that contains Doxygen commands is a doc comment missing its
-    second star. Trailing member-after comments use ``///<`` (not ``//!<``,
-    ``/*!< ... */`` or ``/**< ... */`` -- the block forms get reflowed and
-    mis-attached by clang-format on packed enum values, the line form does not).
-  * ``/**`` sits alone on its line; the closing ``*/`` sits alone on its line.
-  * Every content line is prefixed with `` * `` (no bare-indented continuation).
-  * The first content line is flush (not over-indented).
-  * Doxygen commands use the ``@cmd`` form, not ``\\cmd``.
-  * Use ``@return`` / ``@throws`` rather than prose ``Returns:`` / ``Throws:``.
-  * A plain ``//`` comment carrying a block-level ``@command`` (``@param``,
-    ``@return``, ``@see``, ...) is documentation and must be a ``/** ... */``
-    block (Doxygen ignores ``//``).
-  * Use canonical command spellings: ``@return`` (not ``@returns``),
-    ``@throws`` (not ``@throw``), ``@see`` (not ``@sa``).
-  * Order block tags ``@tparam`` -> ``@param`` -> ``@return``. (Whether
-    ``@param`` order matches the signature is not checked here -- too fragile to
-    parse; Doxygen's WARN_IF_DOC_ERROR covers name mismatches.)
-  * One-liners are expanded to three lines, EXCEPT bare markers ``@{`` / ``@}``
-    / ``@cond [label]`` / ``@endcond`` / ``@file [name]`` which stay on one line.
-
-Left intentionally alone (recognized, valid Doxygen that is not this style's
-concern):
-
-  * ``///<`` trailing "member-after" comments (the house form).
-  * Divider lines made only of slashes (``//////////``).
-  * Plain ``/* ... */`` (non-Doxygen) comments.
-
-Usage:
-    check_doxygen_style.py [FILE ...]      # explicit files
-    check_doxygen_style.py                 # default: src/ and include/ trees
-
-Exit status is non-zero if any violation is found.
-"""
-
-import argparse
-import re
-import sys
-from collections.abc import Iterable, Iterator
-from dataclasses import dataclass
-from enum import Enum
-from pathlib import Path
-
-
-class Category(Enum):
-    """A kind of style violation: a printed ``label`` and its ``description``.
-
-    The description is the default message; a few categories whose wording
-    depends on the offending text (see ``Finding.detail``) override it.
-    """
-
-    def __init__(self, label: str, description: str) -> None:
-        self.label = label
-        self.description = description
-
-    BACKSLASH_COMMAND = ("backslash-command", "use the @cmd form, not \\cmd")
-    WRONG_COMMAND = ("wrong-command", "use the canonical command spelling")
-    TRIPLE_SLASH = ("triple-slash", "use a /** ... */ block instead of ///")
-    QT_MEMBER = ("qt-member", "use ///< instead of //!<")
-    QT_LINE = ("qt-line", "use a /** ... */ block instead of //!")
-    BLOCK_MEMBER = ("block-member", "use ///< instead of /**<")
-    QT_BLOCK_MEMBER = ("qt-block-member", "use ///< instead of /*!<")
-    DOC_IN_LINE_COMMENT = (
-        "doc-in-line-comment",
-        "use a /** ... */ block for documentation, not //",
-    )
-    QT_COMMENT = ("qt-comment", "use /** instead of /*!")
-    SINGLE_LINE_BLOCK = (
-        "single-line-block",
-        "expand one-line /** ... */ to a multi-line block "
-        "(markers @{ @} @cond @endcond @file may stay)",
-    )
-    TEXT_ON_OPENER = ("text-on-opener", "move text off the /** opener line")
-    BARE_CONTINUATION = ("bare-continuation", 'prefix continuation lines with " * "')
-    OVER_INDENTED = ("over-indented", "first content line is over-indented")
-    OVER_INDENTED_TAG = (
-        "over-indented-tag",
-        'Doxygen tag over-indented; use a single space after "*"',
-    )
-    COMBINED_MARKER = (
-        "combined-marker",
-        "scope marker @{ / @} should be its own single-line /** @{ */ block",
-    )
-    PROSE_LABEL = ("prose-label", "use a Doxygen tag instead of a prose label")
-    CONTENT_ON_CLOSER = ("content-on-closer", "move content off the closing */ line")
-    PLAIN_BLOCK_DOC = (
-        "plain-block-doc",
-        "documentation comment must open with /** not /*",
-    )
-    TAG_ORDER = (
-        "tag-order",
-        "block tags out of order; expected @tparam, then @param, then @return",
-    )
-
-
-@dataclass(frozen=True)
-class Finding:
-    """A single style violation at a 1-based line number.
-
-    ``detail`` overrides the category's default description when the message
-    depends on the offending text (e.g. which command was misspelled).
-    """
-
-    line: int
-    category: Category
-    detail: str | None = None
-
-    @property
-    def message(self) -> str:
-        return self.detail if self.detail is not None else self.category.description
-
-
-DEFAULT_ROOTS = ("src", "include")
-EXTS = {".h", ".hpp", ".cpp", ".ipp", ".cxx", ".cc"}
-
-# Every Doxygen command we recognize when written with a backslash (\cmd).
-_ALL_COMMANDS = (
-    "brief|param|tparam|return|returns|retval|note|warning|pre|post|see|sa|ref|"
-    "throw|throws|exception|deprecated|details|code|endcode|verbatim|endverbatim|"
-    "li|arg|c|internal|since|todo|attention|remark|remarks|ingroup|defgroup"
-)
-# Block-level tags whose over-indentation we flag inside a block body.
-_BLOCK_TAGS = (
-    "param|tparam|returns?|retval|brief|throws?|note|warning|"
-    "pre|post|see|sa|details|deprecated"
-)
-# Tags that, appearing anywhere in a comment, mark it as documentation.
-_ANY_DOC_TAGS = (
-    "param|tparam|returns?|retval|brief|throws?|note|warning|pre|post|see|sa"
-)
-# Tags that make a plain // comment a mis-styled doc comment.
-_LINE_DOC_TAGS = "brief|param|tparam|returns?|retval|throws?|note|see|pre|post"
-
-# \cmd that should be @cmd.
-RE_BACKSLASH_CMD = re.compile(r"\\(" + _ALL_COMMANDS + r")\b")
-# Bare markers that may legitimately stay on a single line.
-RE_MARKER = re.compile(r"^@(\{|\}|cond(\s.*)?|endcond|file(\s.*)?)$")
-# Prose section labels that should be Doxygen tags.
-RE_PROSE_LABEL = re.compile(r"^\*\s(Returns|Throws|Exceptions):\s*$")
-# An over-indented block tag: "*" followed by 2+ spaces then the tag.
-RE_OVERINDENTED_TAG = re.compile(r"^\*\s{2,}@(" + _BLOCK_TAGS + r")\b")
-# Any documentation tag (used to spot a doc comment hiding in a plain /* */).
-RE_ANY_DOC_TAG = re.compile(r"@(" + _ANY_DOC_TAGS + r")\b")
-# A documentation tag inside a // comment.
-RE_LINE_DOC_TAG = re.compile(r"@(" + _LINE_DOC_TAGS + r")\b")
-# Order-relevant tags, for the @tparam -> @param -> @return ordering check.
-RE_ORDER_TAG = re.compile(r"^\*\s*@(param|tparam|returns?|retval)\b")
-# First content line indented by 2+ spaces after the "*".
-RE_FIRST_OVERINDENT = re.compile(r"^\s*\*\s{2,}\S")
-# A scope marker @{ / @} sharing a comment with other text.
-RE_COMBINED_MARKER = re.compile(r"^\*\s*@[{}]\s*$")
-
-# Non-canonical command spellings -> the house spelling (bare command names).
-# Used both to flag a wrong @form and to suggest the right @form for a \wrong.
-CANONICAL_COMMAND = {"returns": "return", "throw": "throws", "sa": "see"}
-WRONG_SPELLINGS = [
-    (re.compile(rf"@{wrong}\b"), f"@{right}")
-    for wrong, right in CANONICAL_COMMAND.items()
-]
-
-# Order block tags should appear in; a body out of this order is a violation.
-EXPECTED_TAG_ORDER = ("tparam", "param", "return")
-
-
-def is_doxy_open(stripped: str) -> bool:
-    """True for a line-start Doxygen block opener we should normalize."""
-    if stripped.startswith("/*!"):  # Qt-style Doxygen
-        return not stripped.startswith("/*!<")  # member-after, leave inline
-    return (
-        stripped.startswith("/**")
-        and not stripped.startswith("/***")
-        and not stripped.startswith("/**/")
-        and not stripped.startswith("/**<")
-    )
-
-
-def _flag_commands(raw_line: str, stripped: str, index: int) -> list[Finding]:
-    """Flag \\cmd and misspelled @cmd on a comment line (opener, body, or closer)."""
-    if not stripped.startswith(("*", "//", "/*")):
-        return []
-    findings: list[Finding] = []
-    backslash = RE_BACKSLASH_CMD.search(raw_line)
-    if backslash:
-        command = backslash.group(1)
-        canonical = CANONICAL_COMMAND.get(command, command)
-        findings.append(
-            Finding(
-                index + 1,
-                Category.BACKSLASH_COMMAND,
-                f"use @{canonical} instead of \\{command}",
-            )
-        )
-    for pattern, replacement in WRONG_SPELLINGS:
-        wrong = pattern.search(raw_line)
-        if wrong:
-            findings.append(
-                Finding(
-                    index + 1,
-                    Category.WRONG_COMMAND,
-                    f"use {replacement} instead of {wrong.group(0)}",
-                )
-            )
-    return findings
-
-
-def _flag_line_comment(raw_line: str, stripped: str, index: int) -> Finding | None:
-    """Return the finding for a single-line comment form (///, //!, /**<, ...), else None."""
-    if stripped.startswith("///") and not stripped.startswith(("////", "///<")):
-        return Finding(index + 1, Category.TRIPLE_SLASH)
-    if "//!<" in raw_line:
-        return Finding(index + 1, Category.QT_MEMBER)
-    if stripped.startswith("//!"):
-        return Finding(index + 1, Category.QT_LINE)
-    if "/**<" in raw_line:
-        return Finding(index + 1, Category.BLOCK_MEMBER)
-    if "/*!<" in raw_line:
-        return Finding(index + 1, Category.QT_BLOCK_MEMBER)
-    if stripped.startswith("//") and RE_LINE_DOC_TAG.search(stripped):
-        return Finding(index + 1, Category.DOC_IN_LINE_COMMENT)
-    return None
-
-
-def _flag_single_line_block(stripped: str, line_no: int, is_qt: bool) -> list[Finding]:
-    """Findings for a whole /** ... */ or /*! ... */ block on one line."""
-    inner = re.sub(r"^/\*[*!]", "", stripped)
-    inner = re.sub(r"\*/\s*$", "", inner).strip()
-    findings: list[Finding] = []
-    if is_qt:
-        findings.append(Finding(line_no, Category.QT_COMMENT))
-    if inner and not RE_MARKER.match(inner):
-        findings.append(Finding(line_no, Category.SINGLE_LINE_BLOCK))
-    return findings
-
-
-def _canonical_order_tag(body: str) -> str | None:
-    """The order-relevant tag (tparam/param/return) a body line opens with, if any."""
-    match = RE_ORDER_TAG.match(body)
-    if match is None:
-        return None
-    command = match.group(1)
-    return "return" if command in ("return", "returns", "retval") else command
-
-
-def _flag_body_line(
-    body_line: str, line_no: int, is_first_content: bool
-) -> list[Finding]:
-    """Findings for one interior line of a multi-line block."""
-    body = body_line.strip()
-    findings: list[Finding] = []
-    if body and not body.startswith("*"):
-        findings.append(Finding(line_no, Category.BARE_CONTINUATION))
-    if body.startswith("*"):
-        if is_first_content and RE_FIRST_OVERINDENT.match(body_line):
-            findings.append(Finding(line_no, Category.OVER_INDENTED))
-        if RE_OVERINDENTED_TAG.match(body):
-            findings.append(Finding(line_no, Category.OVER_INDENTED_TAG))
-        if RE_COMBINED_MARKER.match(body):
-            findings.append(Finding(line_no, Category.COMBINED_MARKER))
-        label = RE_PROSE_LABEL.match(body)
-        if label:
-            suggested_tag = "@return" if label.group(1) == "Returns" else "@throws"
-            findings.append(
-                Finding(
-                    line_no,
-                    Category.PROSE_LABEL,
-                    f'use {suggested_tag} instead of prose "{label.group(1)}:"',
-                )
-            )
-    return findings
-
-
-def _flag_closer(closer_line: str, line_no: int) -> list[Finding]:
-    """Findings for content sharing the closing */ line."""
-    before = closer_line[: closer_line.index("*/")].strip()
-    if before and before != "*":
-        return [Finding(line_no, Category.CONTENT_ON_CLOSER)]
-    return []
-
-
-def _flag_tag_order(first_tag_line: dict[str, int]) -> list[Finding]:
-    """One finding if the present block tags are not in EXPECTED_TAG_ORDER."""
-    tag_lines = [
-        first_tag_line[tag] for tag in EXPECTED_TAG_ORDER if tag in first_tag_line
-    ]
-    if tag_lines != sorted(tag_lines):
-        return [Finding(min(tag_lines), Category.TAG_ORDER)]
-    return []
-
-
-def _flag_doxy_block(lines: list[str], start: int) -> tuple[int, list[Finding]]:
-    """Handle a /** or /*! block opening at ``start``; return (next index, findings)."""
-    raw_line = lines[start]
-    stripped = raw_line.lstrip()
-    open_pos = raw_line.index("/*")
-    is_qt = stripped.startswith("/*!")
-
-    # A whole block on one line: /** ... */.
-    if "*/" in raw_line[open_pos + 2 :]:
-        return start + 1, _flag_single_line_block(stripped, start + 1, is_qt)
-
-    # Multi-line block: opener, then scan the body to the closer.
-    findings: list[Finding] = []
-    if is_qt:
-        findings.append(Finding(start + 1, Category.QT_COMMENT))
-    if raw_line[open_pos + 3 :].strip():
-        findings.append(Finding(start + 1, Category.TEXT_ON_OPENER))
-
-    line_count = len(lines)
-    cursor = start + 1
-    is_first_content = True
-    first_tag_line: dict[str, int] = {}  # canonical tag -> 1-based first line
-    while cursor < line_count and "*/" not in lines[cursor]:
-        body_line = lines[cursor]
-        body = body_line.strip()
-        findings.extend(_flag_commands(body_line, body, cursor))
-        tag = _canonical_order_tag(body)
-        if tag is not None:
-            first_tag_line.setdefault(tag, cursor + 1)
-        findings.extend(_flag_body_line(body_line, cursor + 1, is_first_content))
-        if body.startswith("*"):
-            is_first_content = False
-        cursor += 1
-
-    if cursor < line_count:
-        closer_line = lines[cursor]
-        findings.extend(_flag_commands(closer_line, closer_line.strip(), cursor))
-        findings.extend(_flag_closer(closer_line, cursor + 1))
-    findings.extend(_flag_tag_order(first_tag_line))
-
-    return cursor + 1, findings
-
-
-def _flag_plain_block(lines: list[str], start: int) -> tuple[int, list[Finding]]:
-    """Handle a line-start plain /* ... */ block; return (next index, findings).
-
-    Only flagged when it hides a documentation command (a missing second star).
-    """
-    line_count = len(lines)
-    cursor = start
-    while cursor < line_count and "*/" not in lines[cursor]:
-        cursor += 1
-    findings: list[Finding] = []
-    # The opener (start) is command-checked by check_file; check the rest here.
-    for i in range(start + 1, min(cursor + 1, line_count)):
-        findings.extend(_flag_commands(lines[i], lines[i].strip(), i))
-    block_text = "\n".join(
-        lines[start : cursor + 1] if cursor < line_count else lines[start:]
-    )
-    if RE_ANY_DOC_TAG.search(block_text):
-        findings.append(Finding(start + 1, Category.PLAIN_BLOCK_DOC))
-    next_index = cursor + 1 if cursor < line_count else line_count
-    return next_index, findings
-
-
-def check_source(text: str) -> list[Finding]:
-    """Return all style violations found in the given source text."""
-    lines = text.split("\n")
-    findings: list[Finding] = []
-    line_count = len(lines)
-    index = 0
-    in_plain_block = False  # inside a mid-line, non-Doxygen /* ... */
-    while index < line_count:
-        raw_line = lines[index]
-        stripped = raw_line.lstrip()
-
-        # Skip the interior of a plain block opened on an earlier line.
-        if in_plain_block:
-            in_plain_block = "*/" not in raw_line
-            index += 1
-            continue
-
-        findings.extend(_flag_commands(raw_line, stripped, index))
-
-        line_finding = _flag_line_comment(raw_line, stripped, index)
-        if line_finding is not None:
-            findings.append(line_finding)
-            index += 1
-        elif is_doxy_open(stripped):
-            index, block_findings = _flag_doxy_block(lines, index)
-            findings.extend(block_findings)
-        elif stripped.startswith("/*"):
-            index, block_findings = _flag_plain_block(lines, index)
-            findings.extend(block_findings)
-        else:
-            # A /* that opens mid-line without closing starts a plain block.
-            if "/*" in raw_line and not stripped.startswith("//"):
-                if "*/" not in raw_line[raw_line.index("/*") + 2 :]:
-                    in_plain_block = True
-            index += 1
-    return findings
-
-
-def check_file(path: Path) -> list[Finding]:
-    """Return all style violations found in one file."""
-    return check_source(path.read_text(encoding="utf-8"))
-
-
-def iter_files(paths: Iterable[str]) -> Iterator[Path]:
-    """Yield every C++ source file among the given files and directories."""
-    for raw_path in paths:
-        path = Path(raw_path)
-        if path.is_dir():
-            for candidate in path.rglob("*"):
-                if candidate.is_file() and candidate.suffix in EXTS:
-                    yield candidate
-        elif path.suffix in EXTS:
-            yield path
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser(description="Check Doxygen comment style.")
-    parser.add_argument(
-        "files", nargs="*", help="files or directories (default: src/ include/)"
-    )
-    parser.add_argument(
-        "-q", "--quiet", action="store_true", help="only print the summary count"
-    )
-    args = parser.parse_args()
-    roots = args.files or [root for root in DEFAULT_ROOTS if Path(root).is_dir()]
-
-    total = 0
-    for path in sorted(set(iter_files(roots)), key=str):
-        for finding in check_file(path):
-            total += 1
-            if not args.quiet:
-                print(
-                    f"{path}:{finding.line}: {finding.category.label}: {finding.message}"
-                )
-    print(f"\n{total} doxygen-style violation(s)", file=sys.stderr)
-    return 1 if total else 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

bin/pre-commit/clang_tidy_check.py

@@ -1,46 +1,24 @@
 #!/usr/bin/env python3
-"""Pre-commit hook that runs clang-tidy on staged files using run-clang-tidy.
-
-The script determines the staged files itself (see `pass_filenames: false` in
-.pre-commit-config.yaml) so run-clang-tidy is run once and handles parallelism
-internally: pre-commit would otherwise split the files across parallel hook
-invocations that race when fixes edit a shared header.
-
-Fixes are collected with `-export-fixes` and applied by clang-apply-replacements
-in a separate step rather than with run-clang-tidy's `-fix`. The `add_module`
-build isolates each module's headers behind a per-module symlink directory
-(build/modules/<module>/...), so a header reachable from several translation
-units is referenced through different paths that all resolve to the same source
-file. clang-apply-replacements deduplicates identical replacements by their
-literal path, so those paths must be canonicalised to the real source path
-first; otherwise the same fix is applied once per path and corrupts the header.
-"""
+"""Pre-commit hook that runs clang-tidy on changed files using run-clang-tidy."""
 
 from __future__ import annotations
 
+import json
 import os
 import re
 import shutil
 import subprocess
 import sys
-import tempfile
+from collections import defaultdict
 from pathlib import Path
 
-CLANG_TIDY_VERSION = 22
-
-# Extensions run-clang-tidy can analyse: `.cpp` translation units and, thanks to
-# the `verify_headers` build option, `.h`/`.hpp` headers (each has its own
-# compile_commands.json entry). `.ipp` fragments have no entry and are skipped.
-TIDY_EXTENSIONS = {".cpp", ".h", ".hpp"}
-
-# A single-quoted `FilePath:` entry in an -export-fixes YAML file, allowing the
-# `- ` marker that precedes it inside a `Replacements:` sequence. clang-tidy
-# emits paths single-quoted and doubles any embedded quote per YAML rules.
-FILEPATH_RE = re.compile(r"^(\s*(?:-\s+)?FilePath:\s*)'((?:[^']|'')*)'\s*$")
+HEADER_EXTENSIONS = {".h", ".hpp", ".ipp"}
+SOURCE_EXTENSIONS = {".cpp"}
+INCLUDE_RE = re.compile(r"^\s*#\s*include\s*[<\"]([^>\"]+)[>\"]")
 
 
-def find_tool(name: str) -> str | None:
-    for candidate in (f"{name}-{CLANG_TIDY_VERSION}", name):
+def find_run_clang_tidy() -> str | None:
+    for candidate in ("run-clang-tidy-21", "run-clang-tidy"):
         if path := shutil.which(candidate):
             return path
     return None
@@ -54,37 +32,136 @@ def find_build_dir(repo_root: Path) -> Path | None:
     return None
 
 
-def staged_files(repo_root: Path) -> list[Path]:
-    """Return absolute paths of staged, lint-able C/C++ files.
-
-    `--diff-filter=d` excludes deletions so we never lint a removed file.
+def build_include_graph(build_dir: Path, repo_root: Path) -> tuple[dict, set]:
     """
-    output = subprocess.check_output(
-        ["git", "diff", "--staged", "--name-only", "--diff-filter=d", "--"]
-        + [f"*{ext}" for ext in TIDY_EXTENSIONS],
+    Scan all files reachable from compile_commands.json and build an inverted include graph.
+
+    Returns:
+        inverted: header_path -> set of files that include it
+        source_files: set of all TU paths from compile_commands.json
+    """
+    with open(build_dir / "compile_commands.json") as f:
+        db = json.load(f)
+
+    source_files = {Path(e["file"]).resolve() for e in db}
+    include_roots = [repo_root / "include", repo_root / "src"]
+    inverted: dict[Path, set[Path]] = defaultdict(set)
+
+    to_scan: set[Path] = set(source_files)
+    scanned: set[Path] = set()
+
+    while to_scan:
+        file = to_scan.pop()
+        if file in scanned or not file.exists():
+            continue
+        scanned.add(file)
+
+        content = file.read_text()
+
+        for line in content.splitlines():
+            m = INCLUDE_RE.match(line)
+            if not m:
+                continue
+            for root in include_roots:
+                candidate = (root / m.group(1)).resolve()
+                if candidate.exists():
+                    inverted[candidate].add(file)
+                    if candidate not in scanned:
+                        to_scan.add(candidate)
+                    break
+
+    return inverted, source_files
+
+
+def find_tus_for_headers(
+    headers: list[Path],
+    inverted: dict[Path, set[Path]],
+    source_files: set[Path],
+) -> set[Path]:
+    """
+    For each header, pick one TU that transitively includes it.
+    Prefers a TU whose stem matches the header's stem, otherwise picks the first found.
+    """
+    result: set[Path] = set()
+
+    for header in headers:
+        preferred: Path | None = None
+        visited: set[Path] = {header}
+        stack: list[Path] = [header]
+
+        while stack:
+            h = stack.pop()
+            for inc in inverted.get(h, ()):
+                if inc in source_files:
+                    if inc.stem == header.stem:
+                        preferred = inc
+                        break
+                    if preferred is None:
+                        preferred = inc
+                if inc not in visited:
+                    visited.add(inc)
+                    stack.append(inc)
+            if preferred is not None and preferred.stem == header.stem:
+                break
+
+        if preferred is not None:
+            result.add(preferred)
+
+    return result
+
+
+def resolve_files(
+    input_files: list[str], build_dir: Path, repo_root: Path
+) -> list[str]:
+    """
+    Split input into source files and headers. Source files are passed through;
+    headers are resolved to the TUs that transitively include them.
+    """
+    sources: list[Path] = []
+    headers: list[Path] = []
+
+    for f in input_files:
+        p = Path(f).resolve()
+        if p.suffix in SOURCE_EXTENSIONS:
+            sources.append(p)
+        elif p.suffix in HEADER_EXTENSIONS:
+            headers.append(p)
+
+    if not headers:
+        return [str(p) for p in sources]
+
+    print(
+        f"Resolving {len(headers)} header(s) to compilation units...", file=sys.stderr
+    )
+    inverted, source_files = build_include_graph(build_dir, repo_root)
+    tus = find_tus_for_headers(headers, inverted, source_files)
+
+    if not tus:
+        print(
+            "Warning: no compilation units found that include the modified headers; "
+            "skipping clang-tidy for headers.",
+            file=sys.stderr,
+        )
+
+    return sorted({str(p) for p in (*sources, *tus)})
+
+
+def staged_files(repo_root: Path) -> list[str]:
+    result = subprocess.run(
+        ["git", "diff", "--staged", "--name-only", "--diff-filter=d"],
+        capture_output=True,
         text=True,
         cwd=repo_root,
     )
-    return [repo_root / rel for rel in output.splitlines() if rel]
-
-
-def canonicalize_fix_paths(fixes_dir: Path) -> None:
-    """Rewrite every `FilePath` in the exported fixes to its real source path.
-
-    A header included through a module's isolation symlink is recorded under that
-    symlink's path; collapsing all paths to the same real file lets
-    clang-apply-replacements recognise the per-translation-unit duplicates and
-    apply each fix once.
-    """
-    for yaml in fixes_dir.glob("*.yaml"):
-        lines = []
-        for line in yaml.read_text().splitlines():
-            if m := FILEPATH_RE.match(line):
-                path = m.group(2).replace("''", "'")
-                real = os.path.realpath(path).replace("'", "''")
-                line = f"{m.group(1)}'{real}'"
-            lines.append(line)
-        yaml.write_text("\n".join(lines) + "\n")
+    if result.returncode != 0:
+        print(
+            "clang-tidy check failed: 'git diff --staged' command failed.",
+            file=sys.stderr,
+        )
+        if result.stderr:
+            print(result.stderr, file=sys.stderr)
+        sys.exit(result.returncode or 1)
+    return [str(repo_root / p) for p in result.stdout.splitlines() if p]
 
 
 def main():
@@ -98,25 +175,15 @@ def main():
             text=True,
         ).strip()
     )
-
     files = staged_files(repo_root)
     if not files:
         return 0
 
-    run_clang_tidy = find_tool("run-clang-tidy")
-    clang_apply_replacements = find_tool("clang-apply-replacements")
-    missing = [
-        name
-        for name, path in (
-            ("run-clang-tidy", run_clang_tidy),
-            ("clang-apply-replacements", clang_apply_replacements),
-        )
-        if not path
-    ]
-    if missing:
+    run_clang_tidy = find_run_clang_tidy()
+    if not run_clang_tidy:
         print(
-            f"clang-tidy check failed: TIDY is enabled but {' and '.join(missing)} "
-            f"was not found in PATH (tried the '-{CLANG_TIDY_VERSION}' suffix too).",
+            "clang-tidy check failed: TIDY is enabled but neither "
+            "'run-clang-tidy-21' nor 'run-clang-tidy' was found in PATH.",
             file=sys.stderr,
         )
         return 1
@@ -130,23 +197,15 @@ def main():
         )
         return 1
 
-    with tempfile.TemporaryDirectory() as fixes_dir:
-        result = subprocess.run(
-            [
-                run_clang_tidy,
-                "-quiet",
-                "-p",
-                build_dir,
-                "-export-fixes",
-                fixes_dir,
-                "-allow-no-checks",
-            ]
-            + files
-        )
-        canonicalize_fix_paths(Path(fixes_dir))
-        applied = subprocess.run([clang_apply_replacements, fixes_dir])
+    tidy_files = resolve_files(files, build_dir, repo_root)
+    if not tidy_files:
+        return 0
 
-    return result.returncode or applied.returncode
+    result = subprocess.run(
+        [run_clang_tidy, "-quiet", "-p", str(build_dir), "-fix", "-allow-no-checks"]
+        + tidy_files
+    )
+    return result.returncode
 
 
 if __name__ == "__main__":

bin/pre-commit/test_check_doxygen_style.py

@@ -1,406 +0,0 @@
-#!/usr/bin/env python3
-"""
-Tests for check_doxygen_style.py.
-
-Run directly (no test framework needed):
-    ./bin/pre-commit/test_check_doxygen_style.py
-or under pytest:
-    pytest bin/pre-commit/test_check_doxygen_style.py
-"""
-
-import sys
-import textwrap
-
-from check_doxygen_style import Finding, check_source
-
-
-def findings_for(text: str) -> list[Finding]:
-    """Return the style violations for the given source text.
-
-    The text is dedented and its leading newline stripped, so fixtures can be
-    written as indented triple-quoted here-docs while keeping honest 1-based
-    line numbers.
-    """
-    text = textwrap.dedent(text).lstrip("\n")
-    return check_source(text)
-
-
-def labels_for(text: str) -> list[str]:
-    return [f.category.label for f in findings_for(text)]
-
-
-def messages_for(text: str) -> list[str]:
-    return [f.message for f in findings_for(text)]
-
-
-# --- well-formed input produces nothing -------------------------------------
-
-
-def test_clean_block_ok() -> None:
-    code = """
-    /**
-     * Brief.
-     *
-     * @tparam T a type
-     * @param x the x
-     * @return the result
-     */
-    """
-    assert findings_for(code) == []
-
-
-def test_blank_lines_inside_block_ok() -> None:
-    code = """
-    /**
-     * a
-     *
-     * b
-     */
-    """
-    assert findings_for(code) == []
-
-
-def test_member_and_divider_allowed() -> None:
-    assert findings_for("int x;  ///< ok member\n") == []
-    assert findings_for("//////////\n") == []
-    assert findings_for("//// text\n") == []
-
-
-# --- line-comment forms ------------------------------------------------------
-
-
-def test_triple_slash() -> None:
-    code = "/// doc\n"
-    assert labels_for(code) == ["triple-slash"]
-
-
-def test_qt_line() -> None:
-    code = "//! doc\n"
-    assert labels_for(code) == ["qt-line"]
-
-
-def test_qt_member() -> None:
-    code = "int x;  //!< doc\n"
-    assert labels_for(code) == ["qt-member"]
-
-
-def test_block_member() -> None:
-    code = "int x;  /**< doc */\n"
-    assert labels_for(code) == ["block-member"]
-
-
-def test_qt_block_member() -> None:
-    code = "int x;  /*!< doc */\n"
-    assert labels_for(code) == ["qt-block-member"]
-
-
-def test_doc_in_line_comment() -> None:
-    code = "// @param x\n"
-    assert labels_for(code) == ["doc-in-line-comment"]
-
-
-# --- block forms -------------------------------------------------------------
-
-
-def test_qt_comment() -> None:
-    code = """
-    /*!
-     * brief
-     */
-    """
-    assert labels_for(code) == ["qt-comment"]
-
-
-def test_qt_comment_single_line() -> None:
-    # /*! ... */ on one line -> qt-comment (plus single-line-block)
-    code = "/*! brief */\n"
-    assert labels_for(code) == ["qt-comment", "single-line-block"]
-
-
-def test_single_line_block() -> None:
-    code = "/** brief */\n"
-    assert labels_for(code) == ["single-line-block"]
-
-
-def test_single_line_markers_allowed() -> None:
-    for marker in ("@{", "@}", "@cond LABEL", "@endcond", "@file foo.h"):
-        code = f"/** {marker} */\n"
-        assert findings_for(code) == [], marker
-
-
-def test_text_on_opener() -> None:
-    code = """
-    /** text here
-     * more
-     */
-    """
-    assert labels_for(code) == ["text-on-opener"]
-
-
-def test_bare_continuation() -> None:
-    code = """
-    /**
-     * a
-       bare line
-     */
-    """
-    assert labels_for(code) == ["bare-continuation"]
-
-
-def test_over_indented_first_line() -> None:
-    code = """
-    /**
-     *   over
-     */
-    """
-    assert labels_for(code) == ["over-indented"]
-
-
-def test_over_indented_tag() -> None:
-    # a flush first line consumes "first content", isolating the tag check
-    code = """
-    /**
-     * brief
-     *   @param x
-     */
-    """
-    assert labels_for(code) == ["over-indented-tag"]
-
-
-def test_combined_marker() -> None:
-    code = """
-    /**
-     * @{
-     */
-    """
-    assert labels_for(code) == ["combined-marker"]
-
-
-def test_prose_label() -> None:
-    for word in ("Returns", "Throws", "Exceptions"):
-        code = f"""
-        /**
-         * {word}:
-         */
-        """
-        assert labels_for(code) == ["prose-label"], word
-
-
-def test_content_on_closer() -> None:
-    code = """
-    /**
-     * a
-     * b */
-    """
-    assert labels_for(code) == ["content-on-closer"]
-
-
-def test_plain_block_doc() -> None:
-    assert labels_for("/* @param x */\n") == ["plain-block-doc"]
-    assert findings_for("/* just an ordinary note */\n") == []
-
-
-def test_tag_order() -> None:
-    out_of_order = """
-    /**
-     * @param x
-     * @tparam T
-     */
-    """
-    assert labels_for(out_of_order) == ["tag-order"]
-
-    correct = """
-    /**
-     * @tparam T
-     * @param x
-     * @return r
-     */
-    """
-    assert findings_for(correct) == []
-
-    single = """
-    /**
-     * @param x
-     */
-    """
-    assert findings_for(single) == []  # single tag: never out of order
-
-
-# --- command spelling (must work on body/closer lines, not just the opener) --
-
-
-def test_backslash_command_on_body_line() -> None:
-    code = r"""
-    /**
-     * \brief x
-     */
-    """
-    assert labels_for(code) == ["backslash-command"]
-
-
-def test_backslash_command_suggests_canonical_spelling() -> None:
-    # a backslash + non-canonical spelling is fixed in one pass, not two:
-    # \sa -> @see (not @sa), \returns -> @return (not @returns)
-    sa = r"""
-    /**
-     * \sa other
-     */
-    """
-    assert messages_for(sa) == [r"use @see instead of \sa"]
-
-    returns = r"""
-    /**
-     * \returns x
-     */
-    """
-    assert messages_for(returns) == [r"use @return instead of \returns"]
-
-
-def test_wrong_command_on_body_line() -> None:
-    code = """
-    /**
-     * @returns x
-     */
-    """
-    assert labels_for(code) == ["wrong-command"]
-
-
-def test_body_line_commands_regression() -> None:
-    # regression: these live on body lines of a multi-line block
-    code = r"""
-    /**
-     * @returns bad
-     * @throw ex
-     * @sa other
-     * \param y
-     */
-    """
-    assert labels_for(code) == [
-        "wrong-command",
-        "wrong-command",
-        "wrong-command",
-        "backslash-command",
-    ]
-
-
-def test_command_on_closer_line() -> None:
-    code = """
-    /**
-     * a
-     * @sa b */
-    """
-    assert labels_for(code) == ["wrong-command", "content-on-closer"]
-
-
-def test_no_double_count_across_opener_body_closer() -> None:
-    code = """
-    /** @returns opener
-     * @throw body
-     * @sa closer */
-    """
-    assert labels_for(code).count("wrong-command") == 3
-
-
-def test_code_with_word_allowed() -> None:
-    # @code{.cpp} is valid Doxygen and must not be flagged
-    code = """
-    /**
-     * @code{.cpp}
-     * int x;
-     * @endcode
-     */
-    """
-    assert findings_for(code) == []
-
-
-# --- rendered message text ---------------------------------------------------
-
-
-def test_message_uses_category_description() -> None:
-    # a static category renders its default description
-    code = "/// doc\n"
-    assert messages_for(code) == ["use a /** ... */ block instead of ///"]
-
-
-def test_message_detail_overrides() -> None:
-    # dynamic categories render the offending text via Finding.detail
-    backslash = r"""
-    /**
-     * \param y
-     */
-    """
-    assert messages_for(backslash) == [r"use @param instead of \param"]
-
-    wrong = """
-    /**
-     * @returns x
-     */
-    """
-    assert messages_for(wrong) == ["use @return instead of @returns"]
-
-    prose = """
-    /**
-     * Throws:
-     */
-    """
-    assert messages_for(prose) == ['use @throws instead of prose "Throws:"']
-
-
-# --- robustness --------------------------------------------------------------
-
-
-def test_empty_file_no_crash() -> None:
-    assert findings_for("") == []
-
-
-def test_mid_line_plain_block_skipped() -> None:
-    # a /* opened mid-line (after code) and spanning lines is skipped, so its
-    # comment-like contents are not analyzed
-    code = """
-    int x = 0;  /* note: @returns is not a real tag here
-     * @param also not real
-     */
-    int y = 0;
-    """
-    assert findings_for(code) == []
-
-
-def test_unclosed_block_scanned_to_eof() -> None:
-    # an unterminated /** block is still scanned to EOF (no crash, body checked)
-    code = """
-    /**
-     * @returns x
-    """
-    assert labels_for(code) == ["wrong-command"]
-
-
-def test_banner_and_empty_comment_not_flagged() -> None:
-    code = """
-    /***
-     * banner
-     ***/
-    """
-    assert findings_for(code) == []
-    assert findings_for("/**/\n") == []
-
-
-def main() -> int:
-    tests = sorted(
-        (name, fn)
-        for name, fn in globals().items()
-        if name.startswith("test_") and callable(fn)
-    )
-    failed = 0
-    for name, fn in tests:
-        try:
-            fn()
-            print(f"PASS {name}")
-        except AssertionError as exc:
-            failed += 1
-            print(f"FAIL {name}: {exc!r}")
-    print(f"\n{len(tests) - failed}/{len(tests)} passed")
-    return 1 if failed else 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

cmake/XrplCore.cmake

@@ -293,13 +293,4 @@ if(xrpld)
             PRIVATE ${CMAKE_SOURCE_DIR}/external/antithesis-sdk
         )
     endif()
-
-    # The xrpld headers are not built with add_module, so verify them against
-    # the executable's own compile environment.
-    if(verify_headers)
-        verify_target_headers(xrpld "${CMAKE_CURRENT_SOURCE_DIR}/src/xrpld")
-        if(tests)
-            verify_target_headers(xrpld "${CMAKE_CURRENT_SOURCE_DIR}/src/test")
-        endif()
-    endif()
 endif()

cmake/XrplSettings.cmake

@@ -30,23 +30,6 @@ if(tests)
     endif()
 endif()
 
-# Enabled by default so every header is compiled on its own as the main file of
-# its own compile_commands.json entry - this is what lets clang-tidy (and clangd
-# and IDEs) analyse a header's own includes directly. The per-header objects are
-# EXCLUDE_FROM_ALL (see cmake/verify_headers.cmake) and the aggregate target
-# below is not part of `all`, so a normal `cmake --build` never compiles them.
-option(
-    verify_headers
-    "Compile every header on its own to verify it is self-contained."
-    ON
-)
-if(verify_headers)
-    # Aggregate target that builds every per-module header-verification library
-    # created by add_module (see cmake/verify_headers.cmake). Build it with:
-    #   cmake --build . --target verify-headers
-    add_custom_target(verify-headers)
-endif()
-
 option(unity "Creates a build using UNITY support in cmake." OFF)
 if(unity)
     if(NOT is_ci)

cmake/add_module.cmake

@@ -1,5 +1,4 @@
 include(isolate_headers)
-include(verify_headers)
 
 # Create an OBJECT library target named
 #
@@ -38,20 +37,4 @@ function(add_module parent name)
         "${CMAKE_CURRENT_SOURCE_DIR}/src/lib${parent}/${name}"
         PRIVATE
     )
-    # protocol_autogen contains generated headers that are deliberately exempt
-    # from clang-tidy (see ExcludeHeaderFilterRegex in .clang-tidy), so we do not
-    # verify them either.
-    if(
-        verify_headers
-        AND NOT "${parent}/${name}" STREQUAL "xrpl/protocol_autogen"
-    )
-        verify_target_headers(
-            ${target}
-            "${CMAKE_CURRENT_SOURCE_DIR}/include/${parent}/${name}"
-        )
-        verify_target_headers(
-            ${target}
-            "${CMAKE_CURRENT_SOURCE_DIR}/src/lib${parent}/${name}"
-        )
-    endif()
 endfunction()

cmake/scripts/codegen/templates/LedgerEntry.h.mako

@@ -177,9 +177,7 @@ ${field['typeData']['setter_type']} ${field['paramName']}${',' if i < len(requir
         object_ = *sle;
     }
 
-    /**
-     * @brief Ledger entry-specific field setters
-     */
+    /** @brief Ledger entry-specific field setters */
 % for field in fields:
 
     /**

cmake/scripts/codegen/templates/Transaction.h.mako

@@ -185,9 +185,7 @@ public:
         object_ = *tx;
     }
 
-    /**
-     * @brief Transaction-specific field setters
-     */
+    /** @brief Transaction-specific field setters */
 % for field in fields:
 
     /**

cmake/verify_headers.cmake

@@ -1,84 +0,0 @@
-# Our normal build only ever compiles `.cpp` files, so a header is only ever
-# checked through whatever translation unit happens to include it. A header that
-# is missing an `#include` is never caught as long as every `.cpp` that uses it
-# includes its missing dependency first. To check a header on its own we compile
-# it directly as a translation unit.
-#
-# Compiling the header itself - rather than a `.cpp` wrapper that includes it -
-# gives two checks at once:
-#   * the compiler fails if the header is not self-contained, i.e. it uses a
-#     declaration that is not available (directly or transitively); and
-#   * the header is the *main file* of its `compile_commands.json` entry, so
-#     clang-tidy's misc-include-cleaner analyses (and can --fix) the header's own
-#     includes - flagging a dependency that is only available transitively, which
-#     a plain compile cannot catch. A wrapper would be the main file instead, and
-#     include-cleaner never looks inside the headers a main file includes.
-#
-# The objects are never linked anywhere; we build them only for these checks.
-
-# Verify that the headers under headers_dir compile on their own, using the
-# compile environment of an existing target so each header is compiled exactly as
-# that target compiles it. This works for both add_module libraries and the xrpld
-# and test binaries: a library's isolated public and private include directories
-# and a binary's `-I src` both live in its INCLUDE_DIRECTORIES, and the modules or
-# libraries it links live in its LINK_LIBRARIES. We copy those usage requirements
-# through generator expressions (rather than linking ${target}, which is
-# impossible for an executable), evaluated at generation time so they capture
-# requirements the caller adds after this runs. The verify library is created
-# once; call this repeatedly to add more header directories.
-#
-# verify_target_headers(target headers_dir)
-function(verify_target_headers target headers_dir)
-    set(verify ${target}.verify)
-    if(NOT TARGET ${verify})
-        add_library(${verify} OBJECT EXCLUDE_FROM_ALL)
-        # A unity build would concatenate the headers into a single translation
-        # unit, where a header missing an include could be satisfied by one that
-        # precedes it in the blob - exactly the bug we want to catch.
-        set_target_properties(${verify} PROPERTIES UNITY_BUILD OFF)
-        target_include_directories(
-            ${verify}
-            PRIVATE $<TARGET_PROPERTY:${target},INCLUDE_DIRECTORIES>
-        )
-        target_compile_definitions(
-            ${verify}
-            PRIVATE $<TARGET_PROPERTY:${target},COMPILE_DEFINITIONS>
-        )
-        target_compile_options(
-            ${verify}
-            PRIVATE $<TARGET_PROPERTY:${target},COMPILE_OPTIONS>
-        )
-        target_link_libraries(
-            ${verify}
-            PRIVATE $<TARGET_PROPERTY:${target},LINK_LIBRARIES>
-        )
-        add_dependencies(verify-headers ${verify})
-    endif()
-    _verify_add_headers(${verify} "${headers_dir}")
-endfunction()
-
-# Add every .h/.hpp under dir to target as a directly-compiled C++ translation
-# unit. .ipp files are inline-implementation fragments included by their owning
-# header (often after a class declaration), so they are not self-contained on
-# their own and are verified transitively when that header is verified.
-function(_verify_add_headers target dir)
-    file(GLOB_RECURSE headers CONFIGURE_DEPENDS "${dir}/*.h" "${dir}/*.hpp")
-    if(NOT headers)
-        return()
-    endif()
-    # `-xc++` forces the header to be compiled as a C++ translation unit; a lone
-    # `.h` is otherwise treated as a header to precompile. `#pragma once` is
-    # harmless (and warns) when the header is the main file, so silence it.
-    # Compiled on its own, a header legitimately defines constants and static or
-    # template functions that nothing in this single translation unit uses (they
-    # exist for the files that include it), so the resulting unused-entity
-    # warnings are expected and must not fail the build under -Werror.
-    set_source_files_properties(
-        ${headers}
-        PROPERTIES
-            LANGUAGE CXX
-            COMPILE_OPTIONS
-                "-xc++;-Wno-pragma-once-outside-header;-Wno-unused-const-variable;-Wno-unused-function"
-    )
-    target_sources(${target} PRIVATE ${headers})
-endfunction()

conan.lock

@@ -10,22 +10,22 @@
         "rocksdb/10.5.1#4a197eca381a3e5ae8adf8cffa5aacd0%1782392413.075713",
         "re2/20251105#8579cfd0bda4daf0683f9e3898f964b4%1782392402.431897",
         "protobuf/6.33.5#ff253ead763bd8d9904a52979cd21e81%1782392410.233933",
-        "openssl/3.6.3#f806de8933e3bf6f01016c6a888cee2e%1783945160.863288",
+        "openssl/3.6.3#1163d4ddc603907084d08a6a0c6e580f%1782307150.583886",
         "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1782392402.297166",
-        "mpt-crypto/0.4.0-rc4#ffdba12f2332357f0d8b0ae944cfff52%1784138702.932355",
+        "mpt-crypto/0.4.0-rc2#a580f2f9ad0e795de696aa62d54fb9af%1782425834.488828",
         "lz4/1.10.0#982d9b673900f665a1da109e09c17cab%1782392402.164188",
         "libiconv/1.17#9923bc6dc6f106646d6967e0039a5ada%1782392792.775744",
         "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1782392402.420732",
         "libarchive/3.8.7#c446109bd1f1d8ba7936c94189bc50e6%1782392403.066892",
         "jemalloc/5.3.1#1fc58d55316041f10fbc1e8a2eae632a%1776700028.228",
         "gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1782392402.791979",
-        "grpc/1.81.1#f729f6d75992d20f9c72828e9142d62f%1783945160.094135",
+        "grpc/1.81.1#5217e6ef0544c42b46f4af35d5e7f649%1782307148.845616",
         "ed25519/2015.03#ae761bdc52730a843f0809bdf6c1b1f6%1782307148.15562",
         "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1782392402.538492",
         "c-ares/1.34.6#545240bb1c40e2cacd4362d6b8967650%1782392402.681654",
         "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1782392402.296732",
         "boost/1.91.0#ea540ca2133d831b560036aa24dece3c%1782392419.475605",
-        "abseil/20250127.0#9ef01c1451a8340f9022e46238c0fbb6%1783945159.651047"
+        "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1782307147.395833"
     ],
     "build_requires": [
         "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1782392402.122708",
@@ -38,7 +38,7 @@
         "b2/5.4.2#ffd6084a119587e70f11cd45d1a386e2%1782392402.624226",
         "automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56",
         "autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86",
-        "abseil/20250127.0#9ef01c1451a8340f9022e46238c0fbb6%1783945159.651047"
+        "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1782307147.395833"
     ],
     "python_requires": [],
     "overrides": {

conan/profiles/default

@@ -10,18 +10,16 @@
 os={{ os }}
 arch={{ arch }}
 build_type=Debug
-compiler={{ compiler }}
+compiler={{compiler}}
 compiler.version={{ compiler_version }}
 compiler.cppstd=23
 {% if os == "Windows" %}
 compiler.runtime=static
 {% else %}
-compiler.libcxx={{ detect_api.detect_libcxx(compiler, version, compiler_exe) }}
+compiler.libcxx={{detect_api.detect_libcxx(compiler, version, compiler_exe)}}
 {% endif %}
 
 [conf]
-{# By default, Conan tries to reuse binaries built with different cppstd versions. #}
-{# We want to avoid that to improve reproduceability, so we add the cppstd version to the package ID. #}
-{# More info: https://docs.conan.io/2/reference/extensions/binary_compatibility.html #}
-user.package:cppstd_version=23
-tools.info.package_id:confs+=["user.package:cppstd_version"]
+{% if compiler == "gcc" and compiler_version < 13 %}
+tools.build:cxxflags+=['-Wno-restrict']
+{% endif %}

conan/profiles/sanitizers

@@ -87,15 +87,15 @@ include(default)
 {% endif %}
 
 [conf]
-tools.build:defines+={{ defines }}
-tools.build:cxxflags+={{ sanitizer_compiler_flags }}
-tools.build:sharedlinkflags+={{ sanitizer_linker_flags }}
-tools.build:exelinkflags+={{ sanitizer_linker_flags }}
+tools.build:defines+={{defines}}
+tools.build:cxxflags+={{sanitizer_compiler_flags}}
+tools.build:sharedlinkflags+={{sanitizer_linker_flags}}
+tools.build:exelinkflags+={{sanitizer_linker_flags}}
 
 tools.info.package_id:confs+=["tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags", "tools.build:defines"]
 
 # &: means "apply only to the consumer/root package"
-&:tools.cmake.cmaketoolchain:extra_variables={"SANITIZERS": "{{ sanitizers }}", "SANITIZERS_COMPILER_FLAGS": "{{ sanitizer_compiler_flags | join(' ') }}", "SANITIZERS_LINKER_FLAGS": "{{ sanitizer_linker_flags | join(' ') }}"}
+&:tools.cmake.cmaketoolchain:extra_variables={"SANITIZERS": "{{sanitizers}}", "SANITIZERS_COMPILER_FLAGS": "{{sanitizer_compiler_flags | join(' ')}}", "SANITIZERS_LINKER_FLAGS": "{{sanitizer_linker_flags | join(' ')}}"}
 
 [options]
 {% if enable_asan %}

conanfile.py

@@ -30,8 +30,10 @@ class Xrpl(ConanFile):
         "ed25519/2015.03",
         "grpc/1.81.1",
         "libarchive/3.8.7",
+        "mpt-crypto/0.4.0-rc2",
         "nudb/2.0.9",
         "openssl/3.6.3",
+        "secp256k1/0.7.1",
         "soci/4.0.3",
         "zlib/1.3.2",
     ]
@@ -131,15 +133,13 @@ class Xrpl(ConanFile):
     def requirements(self):
         self.requires("boost/1.91.0", force=True, transitive_headers=True)
         self.requires("date/3.0.4", transitive_headers=True)
+        self.requires("lz4/1.10.0", force=True)
+        self.requires("protobuf/6.33.5", force=True)
+        self.requires("sqlite3/3.53.0", force=True)
         if self.options.jemalloc:
             self.requires("jemalloc/5.3.1")
-        self.requires("lz4/1.10.0", force=True)
-        self.requires("mpt-crypto/0.4.0-rc4", transitive_headers=True)
-        self.requires("protobuf/6.33.5", force=True)
         if self.options.rocksdb:
             self.requires("rocksdb/10.5.1")
-        self.requires("secp256k1/0.7.1", transitive_headers=True)
-        self.requires("sqlite3/3.53.0", force=True)
         self.requires("xxhash/0.8.3", transitive_headers=True)
 
     exports_sources = (

cspell.config.yaml

@@ -36,7 +36,9 @@ overrides:
       - /'[^']*'/g # single-quoted strings
       - /`[^`]*`/g # backtick strings
 suggestWords:
-  - unsynched->unsynced
+  - xprl->xrpl
+  - xprld->xrpld # cspell: disable-line not sure what this problem is....
+  - unsynched->unsynced # cspell: disable-line not sure what this problem is....
   - synched->synced
   - synch->sync
 words:
@@ -65,7 +67,6 @@ words:
   - Btrfs
   - Buildx
   - canonicality
-  - canonicalised
   - changespq
   - checkme
   - choco
@@ -73,7 +74,6 @@ words:
   - citardauq
   - clawback
   - clawbacks
-  - clippy
   - cmaketoolchain
   - coeffs
   - coldwallet
@@ -261,7 +261,6 @@ words:
   - rocksdb
   - Rohrs
   - roundings
-  - rustc
   - sahyadri
   - Satoshi
   - scons
@@ -282,8 +281,6 @@ words:
   - sles
   - soci
   - socidb
-  - sponsee
-  - sponsees
   - SRPMS
   - sslws
   - statsd
@@ -305,7 +302,6 @@ words:
   - takerpays
   - ters
   - TMEndpointv2
-  - tparam
   - trixie
   - tx
   - txid
@@ -333,7 +329,6 @@ words:
   - unserviced
   - unshareable
   - unshares
-  - unsponsored
   - unsquelch
   - unsquelched
   - unsquelching

docs/0001-negative-unl/README.md

@@ -288,7 +288,7 @@ components with non-trivial changes are colored green.
     validated.
 
 ![Sequence diagram](./negativeUNL_highLevel_sequence.png?raw=true "Negative UNL
-Changes")
+ Changes")
 
 ## Roads Not Taken
 

docs/build/environment.md

@@ -33,10 +33,9 @@ with a single command and without installing anything system-wide:
 nix --experimental-features 'nix-command flakes' develop
 ```
 
-On **Linux**, Nix also provides the compiler (GCC); on **macOS**, it provides
-Clang. If you instead opt to use your system-wide Apple Clang (via
-`nix develop .#apple-clang`), you need to manage its version yourself (see
-below).
+On **Linux**, Nix also provides the compiler (GCC). On **macOS**, the shell uses
+your **system-wide Apple Clang** as the compiler, so you still need to manage
+its version (see below).
 
 See [Using the Nix development shell](./nix.md) for installation and usage
 details, including how to select a different compiler.
@@ -49,10 +48,10 @@ details, including how to select a different compiler.
 
 ### macOS: managing the Apple Clang version
 
-If you use your system-wide Apple Clang on macOS (via `nix develop .#apple-clang`),
-the compiler version is whatever your installed Xcode (or Command Line Tools)
-provides. The following command should return a version greater than or equal to
-the [minimum required](#tested-compiler-versions):
+Because the Nix shell uses the system-wide Apple Clang on macOS, the compiler
+version is whatever your installed Xcode (or Command Line Tools) provides. The
+following command should return a version greater than or equal to the
+[minimum required](#tested-compiler-versions):
 
 ```bash
 clang --version

docs/build/nix.md

@@ -9,7 +9,7 @@ This guide explains how to use Nix to set up a reproducible development environm
 - **Reproducible environment**: Everyone gets the same versions of tools and compilers
 - **Matches CI**: The Linux CI runs in Docker images built from this exact Nix environment
 - **No system pollution**: Dependencies are isolated and don't affect your system packages
-- **Consistent compilers**: The GCC and Clang shells use the same versions as CI
+- **Multiple compiler versions**: Easily switch between different GCC and Clang versions
 - **Quick setup**: Get started with a single command
 - **Works on Linux and macOS**: Consistent experience across platforms
 
@@ -31,8 +31,8 @@ This will:
 
 - Download and set up all required development tools (CMake, Ninja, Conan, etc.)
 - Configure the appropriate compiler for your platform:
-  - **Linux**: GCC (provided by Nix)
-  - **macOS**: Clang (provided by Nix)
+  - **Linux**: GCC 15.2 (provided by Nix)
+  - **macOS**: Apple Clang (your system compiler)
 
 The first time you run this command, it will take a few minutes to download and build the environment. Subsequent runs will be much faster.
 
@@ -40,12 +40,12 @@ The first time you run this command, it will take a few minutes to download and
 
 - **Linux**: `nix develop` gives you a shell with all the tooling necessary to
   develop xrpld and with GCC 15.2 (also provided by Nix). There are no caveats.
-- **macOS**: `nix develop` gives you a full environment too, with Clang (and
-  every other tool, including Conan) provided by Nix. To use your system-wide
-  Apple Clang instead, enter `nix develop .#apple-clang`. Conan has no binary in
-  the Nix cache for macOS, so it is built from source the first time you enter
-  the shell, which makes the initial setup slower (this is handled
-  automatically; see [`nix/devshell.nix`](../../nix/devshell.nix)).
+- **macOS**: `nix develop` gives you a full environment too. The compiler is
+  your system-wide Apple Clang, while every other tool — including Conan — is
+  provided by Nix. Conan has no binary in the Nix cache for macOS, so it is
+  built from source the first time you enter the shell, which makes the initial
+  setup slower (this is handled automatically; see
+  [`nix/devshell.nix`](../../nix/devshell.nix)).
 
 > [!TIP]
 > To avoid typing `--experimental-features 'nix-command flakes'` every time, you can permanently enable flakes by creating `~/.config/nix/nix.conf`:
@@ -62,9 +62,7 @@ The first time you run this command, it will take a few minutes to download and
 
 ### Choosing a different compiler
 
-A compiler can be chosen by providing its name with the `.#` prefix, e.g. `nix develop .#clang`.
-The `.#gcc` and `.#clang` shells provide the same GCC and Clang versions used in CI
-(pinned in [`nix/packages.nix`](../../nix/packages.nix)).
+A compiler can be chosen by providing its name with the `.#` prefix, e.g. `nix develop .#gcc15`.
 Use `nix flake show` to see all the available development shells.
 
 Use `nix develop .#no-compiler` to use the compiler from your system.
@@ -72,11 +70,11 @@ Use `nix develop .#no-compiler` to use the compiler from your system.
 ### Example Usage
 
 ```bash
-# Use GCC (same version as CI)
-nix develop .#gcc
+# Use GCC 14
+nix develop .#gcc14
 
-# Use Clang (same version as CI)
-nix develop .#clang
+# Use Clang 19
+nix develop .#clang19
 
 # Use default for your platform
 nix develop
@@ -114,15 +112,7 @@ Once inside the Nix development shell, follow the standard [build instructions](
 
 [direnv](https://direnv.net/) or [nix-direnv](https://github.com/nix-community/nix-direnv) can automatically activate the Nix development shell when you enter the repository directory.
 
-This is also the most robust way to use the environment from **any shell** (bash, zsh, fish, …): direnv stays in your current shell and loads the environment _after_ your shell's startup files have run, so the Nix-provided tools take precedence over anything your shell configuration adds to `$PATH`.
-
-The repository already ships an `.envrc` at its root that activates the Nix flake development shell, so you don't need to create one. To use it:
-
-1. [Install direnv](https://direnv.net/docs/installation.html) and [hook it into your shell](https://direnv.net/docs/hook.html) (bash, zsh, fish, …). Installing [nix-direnv](https://github.com/nix-community/nix-direnv) as well is recommended: it caches the shell so that activation is near-instant after the first run.
-2. Run `direnv allow` once in the repository root. direnv will then load (and reload) the Nix development shell automatically whenever you enter the directory.
-
-> [!NOTE]
-> direnv only caches the `.direnv` directory (already listed in `.gitignore`); no other repository files are affected.
+This is also the most robust way to use the environment from **any shell** (bash, zsh, fish, …): direnv stays in your current shell and loads the environment _after_ your shell's startup files have run, so the Nix-provided tools take precedence over anything your shell configuration adds to `$PATH`. To use it, install direnv for your shell, then add an `.envrc` containing `use flake` at the repository root and run `direnv allow`.
 
 ## Conan and Prebuilt Packages
 

include/xrpl/basics/Archive.h

@@ -4,14 +4,13 @@
 
 namespace xrpl {
 
-/**
- * Extract a tar archive compressed with lz4
- *
- * @param src the path of the archive to be extracted
- * @param dst the directory to extract to
- *
- * @throws runtime_error
- */
+/** Extract a tar archive compressed with lz4
+
+    @param src the path of the archive to be extracted
+    @param dst the directory to extract to
+
+    @throws runtime_error
+*/
 void
 extractTarLz4(boost::filesystem::path const& src, boost::filesystem::path const& dst);
 

include/xrpl/basics/Blob.h

@@ -4,10 +4,9 @@
 
 namespace xrpl {
 
-/**
- * Storage for linear binary data.
- * Blocks of binary data appear often in various idioms and structures.
- */
+/** Storage for linear binary data.
+    Blocks of binary data appear often in various idioms and structures.
+*/
 using Blob = std::vector<unsigned char>;
 
 }  // namespace xrpl

include/xrpl/basics/Buffer.h

@@ -6,14 +6,12 @@
 #include <cstdint>
 #include <cstring>
 #include <memory>
-#include <utility>
 
 namespace xrpl {
 
-/**
- * Like std::vector<char> but better.
- * Meets the requirements of BufferFactory.
- */
+/** Like std::vector<char> but better.
+    Meets the requirements of BufferFactory.
+*/
 class Buffer
 {
 private:
@@ -25,37 +23,30 @@ public:
 
     Buffer() = default;
 
-    /**
-     * Create an uninitialized buffer with the given size.
-     */
+    /** Create an uninitialized buffer with the given size. */
     explicit Buffer(std::size_t size)
         : p_((size != 0u) ? new std::uint8_t[size] : nullptr), size_(size)
     {
     }
 
-    /**
-     * Create a buffer as a copy of existing memory.
-     *
-     * @param data a pointer to the existing memory. If
-     *             size is non-zero, it must not be null.
-     * @param size size of the existing memory block.
-     */
+    /** Create a buffer as a copy of existing memory.
+
+        @param data a pointer to the existing memory. If
+                    size is non-zero, it must not be null.
+        @param size size of the existing memory block.
+    */
     Buffer(void const* data, std::size_t size) : Buffer(size)
     {
         if (size != 0u)
             std::memcpy(p_.get(), data, size);
     }
 
-    /**
-     * Copy-construct
-     */
+    /** Copy-construct */
     Buffer(Buffer const& other) : Buffer(other.p_.get(), other.size_)
     {
     }
 
-    /**
-     * Copy assign
-     */
+    /** Copy assign */
     Buffer&
     operator=(Buffer const& other)
     {
@@ -67,19 +58,17 @@ public:
         return *this;
     }
 
-    /**
-     * Move-construct.
-     * The other buffer is reset.
-     */
+    /** Move-construct.
+        The other buffer is reset.
+    */
     Buffer(Buffer&& other) noexcept : p_(std::move(other.p_)), size_(other.size_)
     {
         other.size_ = 0;
     }
 
-    /**
-     * Move-assign.
-     * The other buffer is reset.
-     */
+    /** Move-assign.
+        The other buffer is reset.
+    */
     Buffer&
     operator=(Buffer&& other) noexcept
     {
@@ -92,16 +81,12 @@ public:
         return *this;
     }
 
-    /**
-     * Construct from a slice
-     */
+    /** Construct from a slice */
     explicit Buffer(Slice s) : Buffer(s.data(), s.size())
     {
     }
 
-    /**
-     * Assign from slice
-     */
+    /** Assign from slice */
     Buffer&
     operator=(Slice s)
     {
@@ -115,9 +100,7 @@ public:
         return *this;
     }
 
-    /**
-     * Returns the number of bytes in the buffer.
-     */
+    /** Returns the number of bytes in the buffer. */
     [[nodiscard]] std::size_t
     size() const noexcept
     {
@@ -137,11 +120,10 @@ public:
         return Slice{p_.get(), size_};
     }
 
-    /**
-     * Return a pointer to beginning of the storage.
-     * @note The return type is guaranteed to be a pointer
-     *       to a single byte, to facilitate pointer arithmetic.
-     */
+    /** Return a pointer to beginning of the storage.
+        @note The return type is guaranteed to be a pointer
+              to a single byte, to facilitate pointer arithmetic.
+    */
     /** @{ */
     [[nodiscard]] std::uint8_t const*
     data() const noexcept
@@ -156,10 +138,9 @@ public:
     }
     /** @} */
 
-    /**
-     * Reset the buffer.
-     * All memory is deallocated. The resulting size is 0.
-     */
+    /** Reset the buffer.
+        All memory is deallocated. The resulting size is 0.
+    */
     void
     clear() noexcept
     {
@@ -167,10 +148,9 @@ public:
         size_ = 0;
     }
 
-    /**
-     * Reallocate the storage.
-     * Existing data, if any, is discarded.
-     */
+    /** Reallocate the storage.
+        Existing data, if any, is discarded.
+    */
     std::uint8_t*
     alloc(std::size_t n)
     {

include/xrpl/basics/CompressionAlgorithms.h

@@ -5,15 +5,13 @@
 #include <lz4.h>
 
 #include <algorithm>
-#include <cstddef>
 #include <cstdint>
 #include <stdexcept>
 #include <vector>
 
 namespace xrpl::compression_algorithms {
 
-/**
- * LZ4 block compression.
+/** LZ4 block compression.
  * @tparam BufferFactory Callable object or lambda.
  *     Takes the requested buffer size and returns allocated buffer pointer.
  * @param in Data to compress
@@ -81,8 +79,7 @@ lz4Decompress(
     return decompressedSize;
 }
 
-/**
- * LZ4 block decompression.
+/** LZ4 block decompression.
  * @tparam InputStream ZeroCopyInputStream
  * @param in Input source stream
  * @param inSize Size of compressed data

include/xrpl/basics/CountedObject.h

@@ -9,9 +9,7 @@
 
 namespace xrpl {
 
-/**
- * Manages all counted object types.
- */
+/** Manages all counted object types. */
 class CountedObjects
 {
 public:
@@ -25,11 +23,10 @@ public:
     getCounts(int minimumThreshold) const;
 
 public:
-    /**
-     * Implementation for @ref CountedObject.
-     *
-     * @internal
-     */
+    /** Implementation for @ref CountedObject.
+
+        @internal
+    */
     class Counter
     {
     public:
@@ -97,14 +94,13 @@ private:
 
 //------------------------------------------------------------------------------
 
-/**
- * Tracks the number of instances of an object.
- *
- * Derived classes have their instances counted automatically. This is used
- * for reporting purposes.
- *
- * @ingroup basics
- */
+/** Tracks the number of instances of an object.
+
+    Derived classes have their instances counted automatically. This is used
+    for reporting purposes.
+
+    @ingroup basics
+*/
 template <class Object>
 class CountedObject
 {

include/xrpl/basics/DecayingSample.h

@@ -2,14 +2,12 @@
 
 #include <chrono>
 #include <cmath>
-#include <cstddef>
 
 namespace xrpl {
 
-/**
- * Sampling function using exponential decay to provide a continuous value.
- * @tparam The number of seconds in the decay window.
- */
+/** Sampling function using exponential decay to provide a continuous value.
+    @tparam The number of seconds in the decay window.
+*/
 template <int Window, typename Clock>
 class DecayingSample
 {
@@ -20,16 +18,15 @@ public:
     DecayingSample() = delete;
 
     /**
-     * @param now Start time of DecayingSample.
-     */
+        @param now Start time of DecayingSample.
+    */
     explicit DecayingSample(time_point now) : value_(value_type()), when_(now)
     {
     }
 
-    /**
-     * Add a new sample.
-     * The value is first aged according to the specified time.
-     */
+    /** Add a new sample.
+        The value is first aged according to the specified time.
+    */
     value_type
     add(value_type value, time_point now)
     {
@@ -38,10 +35,9 @@ public:
         return value_ / Window;
     }
 
-    /**
-     * Retrieve the current value in normalized units.
-     * The samples are first aged according to the specified time.
-     */
+    /** Retrieve the current value in normalized units.
+        The samples are first aged according to the specified time.
+    */
     value_type
     value(time_point now)
     {
@@ -90,10 +86,9 @@ private:
 
 //------------------------------------------------------------------------------
 
-/**
- * Sampling function using exponential decay to provide a continuous value.
- * @tparam HalfLife The half life of a sample, in seconds.
- */
+/** Sampling function using exponential decay to provide a continuous value.
+    @tparam HalfLife The half life of a sample, in seconds.
+*/
 template <int HalfLife, class Clock>
 class DecayWindow
 {

include/xrpl/basics/FileUtilities.h

@@ -3,9 +3,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/system/error_code.hpp>
 
-#include <cstddef>
 #include <optional>
-#include <string>
 
 namespace xrpl {
 

include/xrpl/basics/IntrusivePointer.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <concepts>
-#include <cstddef>
 #include <cstdint>
 #include <type_traits>
 #include <utility>
@@ -10,37 +9,33 @@ namespace xrpl {
 
 //------------------------------------------------------------------------------
 
-/**
- * Tag to create an intrusive pointer from another intrusive pointer by using a
- * static cast. This is useful to create an intrusive pointer to a derived
- * class from an intrusive pointer to a base class.
- */
+/** Tag to create an intrusive pointer from another intrusive pointer by using a
+    static cast. This is useful to create an intrusive pointer to a derived
+    class from an intrusive pointer to a base class.
+*/
 struct StaticCastTagSharedIntrusive
 {
 };
 
-/**
- * Tag to create an intrusive pointer from another intrusive pointer by using a
- * dynamic cast. This is useful to create an intrusive pointer to a derived
- * class from an intrusive pointer to a base class. If the cast fails an empty
- * (null) intrusive pointer is created.
- */
+/** Tag to create an intrusive pointer from another intrusive pointer by using a
+    dynamic cast. This is useful to create an intrusive pointer to a derived
+    class from an intrusive pointer to a base class. If the cast fails an empty
+    (null) intrusive pointer is created.
+*/
 struct DynamicCastTagSharedIntrusive
 {
 };
 
-/**
- * When creating or adopting a raw pointer, controls whether the strong count
- * is incremented or not. Use this tag to increment the strong count.
- */
+/** When creating or adopting a raw pointer, controls whether the strong count
+    is incremented or not. Use this tag to increment the strong count.
+*/
 struct SharedIntrusiveAdoptIncrementStrongTag
 {
 };
 
-/**
- * When creating or adopting a raw pointer, controls whether the strong count
- * is incremented or not. Use this tag to leave the strong count unchanged.
- */
+/** When creating or adopting a raw pointer, controls whether the strong count
+    is incremented or not. Use this tag to leave the strong count unchanged.
+*/
 struct SharedIntrusiveAdoptNoIncrementTag
 {
 };
@@ -54,21 +49,20 @@ concept CAdoptTag = std::is_same_v<T, SharedIntrusiveAdoptIncrementStrongTag> ||
 
 //------------------------------------------------------------------------------
 
-/**
- * A shared intrusive pointer class that supports weak pointers.
- *
- * This is meant to be used for SHAMapInnerNodes, but may be useful for other
- * cases. Since the reference counts are stored on the pointee, the pointee is
- * not destroyed until both the strong _and_ weak pointer counts go to zero.
- * When the strong pointer count goes to zero, the "partialDestructor" is
- * called. This can be used to destroy as much of the object as possible while
- * still retaining the reference counts. For example, for SHAMapInnerNodes the
- * children may be reset in that function. Note that std::shared_pointer WILL
- * run the destructor when the strong count reaches zero, but may not free the
- * memory used by the object until the weak count reaches zero. In xrpld, we
- * typically allocate shared pointers with the `make_shared` function. When
- * that is used, the memory is not reclaimed until the weak count reaches zero.
- */
+/** A shared intrusive pointer class that supports weak pointers.
+
+    This is meant to be used for SHAMapInnerNodes, but may be useful for other
+    cases. Since the reference counts are stored on the pointee, the pointee is
+    not destroyed until both the strong _and_ weak pointer counts go to zero.
+    When the strong pointer count goes to zero, the "partialDestructor" is
+    called. This can be used to destroy as much of the object as possible while
+    still retaining the reference counts. For example, for SHAMapInnerNodes the
+    children may be reset in that function. Note that std::shared_pointer WILL
+    run the destructor when the strong count reaches zero, but may not free the
+    memory used by the object until the weak count reaches zero. In xrpld, we
+    typically allocate shared pointers with the `make_shared` function. When
+    that is used, the memory is not reclaimed until the weak count reaches zero.
+*/
 template <class T>
 class SharedIntrusive
 {
@@ -116,9 +110,8 @@ public:
     operator=(
         SharedIntrusive<TT>&& rhs);  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
 
-    /**
-     * Adopt the raw pointer. The strong reference may or may not be
-     * incremented, depending on the TAdoptTag
+    /** Adopt the raw pointer. The strong reference may or may not be
+        incremented, depending on the TAdoptTag
      */
     template <CAdoptTag TAdoptTag = SharedIntrusiveAdoptIncrementStrongTag>
     void
@@ -126,31 +119,27 @@ public:
 
     ~SharedIntrusive();
 
-    /**
-     * Create a new SharedIntrusive by statically casting the pointer
-     * controlled by the rhs param.
-     */
+    /** Create a new SharedIntrusive by statically casting the pointer
+        controlled by the rhs param.
+    */
     template <class TT>
     SharedIntrusive(StaticCastTagSharedIntrusive, SharedIntrusive<TT> const& rhs);
 
-    /**
-     * Create a new SharedIntrusive by statically casting the pointer
-     * controlled by the rhs param.
-     */
+    /** Create a new SharedIntrusive by statically casting the pointer
+       controlled by the rhs param.
+    */
     template <class TT>
     SharedIntrusive(StaticCastTagSharedIntrusive, SharedIntrusive<TT>&& rhs);
 
-    /**
-     * Create a new SharedIntrusive by dynamically casting the pointer
-     * controlled by the rhs param.
-     */
+    /** Create a new SharedIntrusive by dynamically casting the pointer
+       controlled by the rhs param.
+    */
     template <class TT>
     SharedIntrusive(DynamicCastTagSharedIntrusive, SharedIntrusive<TT> const& rhs);
 
-    /**
-     * Create a new SharedIntrusive by dynamically casting the pointer
-     * controlled by the rhs param.
-     */
+    /** Create a new SharedIntrusive by dynamically casting the pointer
+       controlled by the rhs param.
+    */
     template <class TT>
     SharedIntrusive(DynamicCastTagSharedIntrusive, SharedIntrusive<TT>&& rhs);
 
@@ -163,22 +152,17 @@ public:
     explicit
     operator bool() const noexcept;
 
-    /**
-     * Set the pointer to null, decrement the strong count, and run the
-     * appropriate release action.
-     */
+    /** Set the pointer to null, decrement the strong count, and run the
+        appropriate release action.
+      */
     void
     reset();
 
-    /**
-     * Get the raw pointer
-     */
+    /** Get the raw pointer */
     [[nodiscard]] T*
     get() const;
 
-    /**
-     * Return the strong count
-     */
+    /** Return the strong count */
     [[nodiscard]] std::size_t
     useCount() const;
 
@@ -196,51 +180,43 @@ public:
     friend class WeakIntrusive;
 
 private:
-    /**
-     * Return the raw pointer held by this object.
-     */
+    /** Return the raw pointer held by this object. */
     [[nodiscard]] T*
     unsafeGetRawPtr() const;
 
-    /**
-     * Exchange the current raw pointer held by this object with the given
-     * pointer. Decrement the strong count of the raw pointer previously held
-     * by this object and run the appropriate release action.
+    /** Exchange the current raw pointer held by this object with the given
+        pointer. Decrement the strong count of the raw pointer previously held
+        by this object and run the appropriate release action.
      */
     void
     unsafeReleaseAndStore(T* next);
 
-    /**
-     * Set the raw pointer directly. This is wrapped in a function so the class
-     * can support both atomic and non-atomic pointers in a future patch.
+    /** Set the raw pointer directly. This is wrapped in a function so the class
+        can support both atomic and non-atomic pointers in a future patch.
      */
     void
     unsafeSetRawPtr(T* p);
 
-    /**
-     * Exchange the raw pointer directly.
-     * This sets the raw pointer to the given value and returns the previous
-     * value. This is wrapped in a function so the class can support both
-     * atomic and non-atomic pointers in a future patch.
+    /** Exchange the raw pointer directly.
+        This sets the raw pointer to the given value and returns the previous
+        value. This is wrapped in a function so the class can support both
+        atomic and non-atomic pointers in a future patch.
      */
     T*
     unsafeExchange(T* p);
 
-    /**
-     * pointer to the type with an intrusive count
-     */
+    /** pointer to the type with an intrusive count */
     T* ptr_{nullptr};
 };
 
 //------------------------------------------------------------------------------
 
-/**
- * A weak intrusive pointer class for the SharedIntrusive pointer class.
- *
- * Note that this weak pointer class asks differently from normal weak pointer
- * classes. When the strong pointer count goes to zero, the "partialDestructor"
- * is called. See the comment on SharedIntrusive for a fuller explanation.
- */
+/** A weak intrusive pointer class for the SharedIntrusive pointer class.
+
+Note that this weak pointer class asks differently from normal weak pointer
+classes. When the strong pointer count goes to zero, the "partialDestructor"
+is called. See the comment on SharedIntrusive for a fuller explanation.
+*/
 template <class T>
 class WeakIntrusive
 {
@@ -270,62 +246,54 @@ public:
     WeakIntrusive&
     operator=(SharedIntrusive<TT> const& rhs);
 
-    /**
-     * Adopt the raw pointer and increment the weak count.
-     */
+    /** Adopt the raw pointer and increment the weak count. */
     void
     adopt(T* ptr);
 
     ~WeakIntrusive();
 
-    /**
-     * Get a strong pointer from the weak pointer, if possible. This will
-     * only return a seated pointer if the strong count on the raw pointer
-     * is non-zero before locking.
+    /** Get a strong pointer from the weak pointer, if possible. This will
+       only return a seated pointer if the strong count on the raw pointer
+       is non-zero before locking.
      */
     SharedIntrusive<T>
     lock() const;
 
-    /**
-     * Return true if the strong count is zero.
-     */
+    /** Return true if the strong count is zero. */
     [[nodiscard]] bool
     expired() const;
 
-    /**
-     * Set the pointer to null and decrement the weak count.
-     *
-     * Note: This may run the destructor if the strong count is zero.
-     */
+    /** Set the pointer to null and decrement the weak count.
+
+    Note: This may run the destructor if the strong count is zero.
+    */
     void
     reset();
 
 private:
     T* ptr_ = nullptr;
 
-    /**
-     * Decrement the weak count. This does _not_ set the raw pointer to
-     * null.
-     *
-     * Note: This may run the destructor if the strong count is zero.
-     */
+    /** Decrement the weak count. This does _not_ set the raw pointer to
+    null.
+
+    Note: This may run the destructor if the strong count is zero.
+    */
     void
     unsafeReleaseNoStore();
 };
 
 //------------------------------------------------------------------------------
 
-/**
- * A combination of a strong and a weak intrusive pointer stored in the
- * space of a single pointer.
- *
- * This class is similar to a `std::variant<SharedIntrusive,WeakIntrusive>`
- * with some optimizations. In particular, it uses a low-order bit to
- * determine if the raw pointer represents a strong pointer or a weak
- * pointer. It can also be quickly switched between its strong pointer and
- * weak pointer representations. This class is useful for storing intrusive
- * pointers in tagged caches.
- */
+/** A combination of a strong and a weak intrusive pointer stored in the
+    space of a single pointer.
+
+    This class is similar to a `std::variant<SharedIntrusive,WeakIntrusive>`
+    with some optimizations. In particular, it uses a low-order bit to
+    determine if the raw pointer represents a strong pointer or a weak
+    pointer. It can also be quickly switched between its strong pointer and
+    weak pointer representations. This class is useful for storing intrusive
+    pointers in tagged caches.
+  */
 
 template <class T>
 class SharedWeakUnion
@@ -367,83 +335,69 @@ public:
 
     ~SharedWeakUnion();
 
-    /**
-     * Return a strong pointer if this is already a strong pointer (i.e.
-     * don't lock the weak pointer. Use the `lock` method if that's what's
-     * needed)
+    /** Return a strong pointer if this is already a strong pointer (i.e.
+       don't lock the weak pointer. Use the `lock` method if that's what's
+       needed)
      */
     [[nodiscard]] SharedIntrusive<T>
     getStrong() const;
 
-    /**
-     * Return true if this is a strong pointer and the strong pointer is
-     * seated.
+    /** Return true if this is a strong pointer and the strong pointer is
+        seated.
      */
     explicit
     operator bool() const noexcept;
 
-    /**
-     * Set the pointer to null, decrement the appropriate ref count, and
-     * run the appropriate release action.
+    /** Set the pointer to null, decrement the appropriate ref count, and
+       run the appropriate release action.
      */
     void
     reset();
 
-    /**
-     * If this is a strong pointer, return the raw pointer. Otherwise
-     * return null.
+    /** If this is a strong pointer, return the raw pointer. Otherwise
+       return null.
      */
     [[nodiscard]] T*
     get() const;
 
-    /**
-     * If this is a strong pointer, return the strong count. Otherwise
+    /** If this is a strong pointer, return the strong count. Otherwise
      * return 0
      */
     [[nodiscard]] std::size_t
     useCount() const;
 
-    /**
-     * Return true if there is a non-zero strong count.
-     */
+    /** Return true if there is a non-zero strong count. */
     [[nodiscard]] bool
     expired() const;
 
-    /**
-     * If this is a strong pointer, return the strong pointer. Otherwise
-     * attempt to lock the weak pointer.
+    /** If this is a strong pointer, return the strong pointer. Otherwise
+        attempt to lock the weak pointer.
      */
     [[nodiscard]] SharedIntrusive<T>
     lock() const;
 
-    /**
-     * Return true is this represents a strong pointer.
-     */
+    /** Return true is this represents a strong pointer. */
     [[nodiscard]] bool
     isStrong() const;
 
-    /**
-     * Return true is this represents a weak pointer.
-     */
+    /** Return true is this represents a weak pointer. */
     [[nodiscard]] bool
     isWeak() const;
 
-    /**
-     * If this is a weak pointer, attempt to convert it to a strong
-     * pointer.
-     *
-     * @return true if successfully converted to a strong pointer (or was
-     *         already a strong pointer). Otherwise false.
-     */
+    /** If this is a weak pointer, attempt to convert it to a strong
+       pointer.
+
+        @return true if successfully converted to a strong pointer (or was
+                already a strong pointer). Otherwise false.
+      */
     bool
     convertToStrong();
 
-    /**
-     * If this is a strong pointer, attempt to convert it to a weak
-     * pointer.
-     *
-     * @return false if the pointer is null. Otherwise return true.
-     */
+    /** If this is a strong pointer, attempt to convert it to a weak
+       pointer.
+
+        @return false if the pointer is null. Otherwise return true.
+      */
     bool
     convertToWeak();
 
@@ -456,27 +410,23 @@ private:
     static constexpr std::uintptr_t kPtrMask = ~kTagMask;
 
 private:
-    /**
-     * Return the raw pointer held by this object.
+    /** Return the raw pointer held by this object.
      */
     [[nodiscard]] T*
     unsafeGetRawPtr() const;
 
     enum class RefStrength { Strong, Weak };
-    /**
-     * Set the raw pointer and tag bit directly.
+    /** Set the raw pointer and tag bit directly.
      */
     void
     unsafeSetRawPtr(T* p, RefStrength rs);
 
-    /**
-     * Set the raw pointer and tag bit to all zeros (strong null pointer).
+    /** Set the raw pointer and tag bit to all zeros (strong null pointer).
      */
     void unsafeSetRawPtr(std::nullptr_t);
 
-    /**
-     * Decrement the appropriate ref count, and run the appropriate release
-     * action. Note: this does _not_ set the raw pointer to null.
+    /** Decrement the appropriate ref count, and run the appropriate release
+        action. Note: this does _not_ set the raw pointer to null.
      */
     void
     unsafeReleaseNoStore();
@@ -484,13 +434,12 @@ private:
 
 //------------------------------------------------------------------------------
 
-/**
- * Create a shared intrusive pointer.
- *
- * Note: unlike std::shared_ptr, where there is an advantage of allocating
- * the pointer and control block together, there is no benefit for intrusive
- * pointers.
- */
+/** Create a shared intrusive pointer.
+
+    Note: unlike std::shared_ptr, where there is an advantage of allocating
+    the pointer and control block together, there is no benefit for intrusive
+    pointers.
+*/
 template <class TT, class... Args>
 SharedIntrusive<TT>
 makeSharedIntrusive(Args&&... args)

include/xrpl/basics/IntrusivePointer.ipp

@@ -641,9 +641,6 @@ template <class T>
 T*
 SharedWeakUnion<T>::unsafeGetRawPtr() const
 {
-    // tp_ packs a raw pointer together with a strength bit; recovering the
-    // pointer inherently requires an integer-to-pointer cast.
-    // NOLINTNEXTLINE(performance-no-int-to-ptr)
     return reinterpret_cast<T*>(tp_ & kPtrMask);
 }
 

include/xrpl/basics/IntrusiveRefCounts.h

@@ -3,43 +3,39 @@
 #include <xrpl/beast/utility/instrumentation.h>
 
 #include <atomic>
-#include <cstddef>
 #include <cstdint>
 
 namespace xrpl {
 
-/**
- * Action to perform when releasing a strong pointer.
- *
- * noop: Do nothing. For example, a `noop` action will occur when a count is
- * decremented to a non-zero value.
- *
- * partialDestroy: Run the `partialDestructor`. This action will happen when a
- * strong count is decremented to zero and the weak count is non-zero.
- *
- * destroy: Run the destructor. This action will occur when either the strong
- * count or weak count is decremented and the other count is also zero.
+/** Action to perform when releasing a strong pointer.
+
+    noop: Do nothing. For example, a `noop` action will occur when a count is
+    decremented to a non-zero value.
+
+    partialDestroy: Run the `partialDestructor`. This action will happen when a
+    strong count is decremented to zero and the weak count is non-zero.
+
+    destroy: Run the destructor. This action will occur when either the strong
+    count or weak count is decremented and the other count is also zero.
  */
 enum class ReleaseStrongRefAction { NoOp, PartialDestroy, Destroy };
 
-/**
- * Action to perform when releasing a weak pointer.
- *
- * noop: Do nothing. For example, a `noop` action will occur when a count is
- * decremented to a non-zero value.
- *
- * destroy: Run the destructor. This action will occur when either the strong
- * count or weak count is decremented and the other count is also zero.
+/** Action to perform when releasing a weak pointer.
+
+    noop: Do nothing. For example, a `noop` action will occur when a count is
+    decremented to a non-zero value.
+
+    destroy: Run the destructor. This action will occur when either the strong
+    count or weak count is decremented and the other count is also zero.
  */
 enum class ReleaseWeakRefAction { NoOp, Destroy };
 
-/**
- * Implement the strong count, weak count, and bit flags for an intrusive
- * pointer.
- *
- * A class can satisfy the requirements of an xrpl::IntrusivePointer by
- * inheriting from this class.
- */
+/** Implement the strong count, weak count, and bit flags for an intrusive
+    pointer.
+
+    A class can satisfy the requirements of an xrpl::IntrusivePointer by
+    inheriting from this class.
+  */
 struct IntrusiveRefCounts
 {
     virtual ~IntrusiveRefCounts() noexcept;
@@ -108,123 +104,109 @@ private:
     static constexpr size_t kFieldTypeBits = sizeof(FieldType) * 8;
     static constexpr FieldType kOne = 1;
 
-    /**
-     * `refCounts` consists of four fields that are treated atomically:
-     *
-     * 1. Strong count. This is a count of the number of shared pointers that
-     * hold a reference to this object. When the strong counts goes to zero,
-     * if the weak count is zero, the destructor is run. If the weak count is
-     * non-zero when the strong count goes to zero then the partialDestructor
-     * is run.
-     *
-     * 2. Weak count. This is a count of the number of weak pointer that hold
-     * a reference to this object. When the weak count goes to zero and the
-     * strong count is also zero, then the destructor is run.
-     *
-     * 3. Partial destroy started bit. This bit is set if the
-     * `partialDestructor` function has been started (or is about to be
-     * started). This is used to prevent the destructor from running
-     * concurrently with the partial destructor. This can easily happen when
-     * the last strong pointer release its reference in one thread and starts
-     * the partialDestructor, while in another thread the last weak pointer
-     * goes out of scope and starts the destructor while the partialDestructor
-     * is still running. Both a start and finished bit is needed to handle a
-     * corner-case where the last strong pointer goes out of scope, then then
-     * last `weakPointer` goes out of scope, but this happens before the
-     * `partialDestructor` bit is set. It would be possible to use a single
-     * bit if it could also be set atomically when the strong count goes to
-     * zero and the weak count is non-zero, but that would add complexity (and
-     * likely slow down common cases as well).
-     *
-     * 4. Partial destroy finished bit. This bit is set when the
-     * `partialDestructor` has finished running. See (3) above for more
-     * information.
-     */
+    /** `refCounts` consists of four fields that are treated atomically:
+
+         1. Strong count. This is a count of the number of shared pointers that
+         hold a reference to this object. When the strong counts goes to zero,
+         if the weak count is zero, the destructor is run. If the weak count is
+         non-zero when the strong count goes to zero then the partialDestructor
+         is run.
+
+         2. Weak count. This is a count of the number of weak pointer that hold
+         a reference to this object. When the weak count goes to zero and the
+         strong count is also zero, then the destructor is run.
+
+         3. Partial destroy started bit. This bit is set if the
+         `partialDestructor` function has been started (or is about to be
+         started). This is used to prevent the destructor from running
+         concurrently with the partial destructor. This can easily happen when
+         the last strong pointer release its reference in one thread and starts
+         the partialDestructor, while in another thread the last weak pointer
+         goes out of scope and starts the destructor while the partialDestructor
+         is still running. Both a start and finished bit is needed to handle a
+         corner-case where the last strong pointer goes out of scope, then then
+         last `weakPointer` goes out of scope, but this happens before the
+         `partialDestructor` bit is set. It would be possible to use a single
+         bit if it could also be set atomically when the strong count goes to
+         zero and the weak count is non-zero, but that would add complexity (and
+         likely slow down common cases as well).
+
+         4. Partial destroy finished bit. This bit is set when the
+         `partialDestructor` has finished running. See (3) above for more
+         information.
+
+         */
 
     mutable std::atomic<FieldType> refCounts_{kStrongDelta};
 
-    /**
-     * Amount to change the strong count when adding or releasing a reference
-     *
-     *   Note: The strong count is stored in the low `StrongCountNumBits` bits
-     * of refCounts
-     */
+    /**  Amount to change the strong count when adding or releasing a reference
+
+         Note: The strong count is stored in the low `StrongCountNumBits` bits
+       of refCounts
+      */
     static constexpr FieldType kStrongDelta = 1;
 
-    /**
-     * Amount to change the weak count when adding or releasing a reference
-     *
-     * Note: The weak count is stored in the high `WeakCountNumBits` bits of
-     * refCounts
-     */
+    /**  Amount to change the weak count when adding or releasing a reference
+
+         Note: The weak count is stored in the high `WeakCountNumBits` bits of
+         refCounts
+      */
     static constexpr FieldType kWeakDelta = (kOne << kStrongCountNumBits);
 
-    /**
-     * Flag that is set when the partialDestroy function has started running
-     * (or is about to start running).
-     *
-     * See description of the `refCounts` field for a fuller description of
-     * this field.
-     */
+    /**  Flag that is set when the partialDestroy function has started running
+         (or is about to start running).
+
+         See description of the `refCounts` field for a fuller description of
+         this field.
+      */
     static constexpr FieldType kPartialDestroyStartedMask = (kOne << (kFieldTypeBits - 1));
 
-    /**
-     * Flag that is set when the partialDestroy function has finished running
-     *
-     * See description of the `refCounts` field for a fuller description of
-     * this field.
-     */
+    /**  Flag that is set when the partialDestroy function has finished running
+
+         See description of the `refCounts` field for a fuller description of
+         this field.
+      */
     static constexpr FieldType kPartialDestroyFinishedMask = (kOne << (kFieldTypeBits - 2));
 
-    /**
-     * Mask that will zero out all the `count` bits and leave the tag bits
-     * unchanged.
-     */
+    /** Mask that will zero out all the `count` bits and leave the tag bits
+        unchanged.
+      */
     static constexpr FieldType kTagMask = kPartialDestroyStartedMask | kPartialDestroyFinishedMask;
 
-    /**
-     * Mask that will zero out the `tag` bits and leave the count bits
-     * unchanged.
-     */
+    /** Mask that will zero out the `tag` bits and leave the count bits
+        unchanged.
+      */
     static constexpr FieldType kValueMask = ~kTagMask;
 
-    /**
-     * Mask that will zero out everything except the strong count.
+    /** Mask that will zero out everything except the strong count.
      */
     static constexpr FieldType kStrongMask = ((kOne << kStrongCountNumBits) - 1) & kValueMask;
 
-    /**
-     * Mask that will zero out everything except the weak count.
+    /** Mask that will zero out everything except the weak count.
      */
     static constexpr FieldType kWeakMask =
         (((kOne << kWeakCountNumBits) - 1) << kStrongCountNumBits) & kValueMask;
 
-    /**
-     * Unpack the count and tag fields from the packed atomic integer form.
-     */
+    /** Unpack the count and tag fields from the packed atomic integer form. */
     struct RefCountPair
     {
         CountType strong;
         CountType weak;
-        /**
-         * The `partialDestroyStartedBit` is set to on when the partial
-         * destroy function is started. It is not a boolean; it is a uint32
-         * with all bits zero with the possible exception of the
-         * `partialDestroyStartedMask` bit. This is done so it can be directly
-         * masked into the `combinedValue`.
+        /**  The `partialDestroyStartedBit` is set to on when the partial
+             destroy function is started. It is not a boolean; it is a uint32
+             with all bits zero with the possible exception of the
+             `partialDestroyStartedMask` bit. This is done so it can be directly
+             masked into the `combinedValue`.
          */
         FieldType partialDestroyStartedBit{0};
-        /**
-         * The `partialDestroyFinishedBit` is set to on when the partial
-         * destroy function has finished.
+        /**  The `partialDestroyFinishedBit` is set to on when the partial
+             destroy function has finished.
          */
         FieldType partialDestroyFinishedBit{0};
         RefCountPair(FieldType v) noexcept;
         RefCountPair(CountType s, CountType w) noexcept;
 
-        /**
-         * Convert back to the packed integer form.
-         */
+        /** Convert back to the packed integer form. */
         [[nodiscard]] FieldType
         combinedValue() const noexcept;
 
@@ -232,10 +214,9 @@ private:
             static_cast<CountType>((kOne << kStrongCountNumBits) - 1);
         static constexpr CountType kMaxWeakValue =
             static_cast<CountType>((kOne << kWeakCountNumBits) - 1);
-        /**
-         * Put an extra margin to detect when running up against limits.
-         * This is only used in debug code, and is useful if we reduce the
-         * number of bits in the strong and weak counts (to 16 and 14 bits).
+        /**  Put an extra margin to detect when running up against limits.
+             This is only used in debug code, and is useful if we reduce the
+             number of bits in the strong and weak counts (to 16 and 14 bits).
          */
         static constexpr CountType kCheckStrongMaxValue = kMaxStrongValue - 32;
         static constexpr CountType kCheckWeakMaxValue = kMaxWeakValue - 32;

include/xrpl/basics/LocalValue.h

@@ -70,15 +70,11 @@ public:
     {
     }
 
-    /**
-     * Stores instance of T specific to the calling coroutine or thread.
-     */
+    /** Stores instance of T specific to the calling coroutine or thread. */
     T&
     operator*();
 
-    /**
-     * Stores instance of T specific to the calling coroutine or thread.
-     */
+    /** Stores instance of T specific to the calling coroutine or thread. */
     T*
     operator->()
     {

include/xrpl/basics/Log.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/beast/utility/Journal.h>
 
 #include <boost/beast/core/string.hpp>
@@ -10,15 +11,11 @@
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <string>
 #include <utility>
-#include <vector>
 
 namespace xrpl {
 
-/**
- * Manages partitions for logging.
- */
+/** Manages partitions for logging. */
 class Logs
 {
 private:
@@ -42,81 +39,69 @@ private:
         writeAlways(beast::Severity level, std::string const& text) override;
     };
 
-    /**
-     * Manages a system file containing logged output.
-     * The system file remains open during program execution. Interfaces
-     * are provided for interoperating with standard log management
-     * tools like logrotate(8):
-     *     http://linuxcommand.org/man_pages/logrotate8.html
-     * @note None of the listed interfaces are thread-safe.
-     */
+    /** Manages a system file containing logged output.
+        The system file remains open during program execution. Interfaces
+        are provided for interoperating with standard log management
+        tools like logrotate(8):
+            http://linuxcommand.org/man_pages/logrotate8.html
+        @note None of the listed interfaces are thread-safe.
+    */
     class File
     {
     public:
-        /**
-         * Construct with no associated system file.
-         * A system file may be associated later with @ref open.
-         * @see open
-         */
+        /** Construct with no associated system file.
+            A system file may be associated later with @ref open.
+            @see open
+        */
         File();
 
-        /**
-         * Destroy the object.
-         * If a system file is associated, it will be flushed and closed.
-         */
+        /** Destroy the object.
+            If a system file is associated, it will be flushed and closed.
+        */
         ~File() = default;
 
-        /**
-         * Determine if a system file is associated with the log.
-         * @return `true` if a system file is associated and opened for
-         * writing.
-         */
+        /** Determine if a system file is associated with the log.
+            @return `true` if a system file is associated and opened for
+            writing.
+        */
         [[nodiscard]] bool
         isOpen() const noexcept;
 
-        /**
-         * Associate a system file with the log.
-         * If the file does not exist an attempt is made to create it
-         * and open it for writing. If the file already exists an attempt is
-         * made to open it for appending.
-         * If a system file is already associated with the log, it is closed
-         * first.
-         * @return `true` if the file was opened.
-         */
+        /** Associate a system file with the log.
+            If the file does not exist an attempt is made to create it
+            and open it for writing. If the file already exists an attempt is
+            made to open it for appending.
+            If a system file is already associated with the log, it is closed
+            first.
+            @return `true` if the file was opened.
+        */
         bool
         open(boost::filesystem::path const& path);
 
-        /**
-         * Close and re-open the system file associated with the log
-         * This assists in interoperating with external log management tools.
-         * @return `true` if the file was opened.
-         */
+        /** Close and re-open the system file associated with the log
+            This assists in interoperating with external log management tools.
+            @return `true` if the file was opened.
+        */
         bool
         closeAndReopen();
 
-        /**
-         * Close the system file if it is open.
-         */
+        /** Close the system file if it is open. */
         void
         close();
 
-        /**
-         * write to the log file.
-         * Does nothing if there is no associated system file.
-         */
+        /** write to the log file.
+            Does nothing if there is no associated system file.
+        */
         void
         write(char const* text);
 
-        /**
-         * write to the log file and append an end of line marker.
-         * Does nothing if there is no associated system file.
-         */
+        /** write to the log file and append an end of line marker.
+            Does nothing if there is no associated system file.
+        */
         void
         writeln(char const* text);
 
-        /**
-         * Write to the log file using std::string.
-         */
+        /** Write to the log file using std::string. */
         /** @{ */
         void
         write(std::string const& str)
@@ -237,21 +222,19 @@ private:
 //------------------------------------------------------------------------------
 // Debug logging:
 
-/**
- * Set the sink for the debug journal.
- *
- * @param sink unique_ptr to new debug Sink.
- * @return unique_ptr to the previous Sink.  nullptr if there was no Sink.
- */
+/** Set the sink for the debug journal.
+
+    @param sink unique_ptr to new debug Sink.
+    @return unique_ptr to the previous Sink.  nullptr if there was no Sink.
+*/
 std::unique_ptr<beast::Journal::Sink>
 setDebugLogSink(std::unique_ptr<beast::Journal::Sink> sink);
 
-/**
- * Returns a debug journal.
- * The journal may drain to a null sink, so its output
- * may never be seen. Never use it for critical
- * information.
- */
+/** Returns a debug journal.
+    The journal may drain to a null sink, so its output
+    may never be seen. Never use it for critical
+    information.
+*/
 beast::Journal
 debugLog();
 

include/xrpl/basics/MathUtilities.h

@@ -6,8 +6,7 @@
 
 namespace xrpl {
 
-/**
- * Calculate one number divided by another number in percentage.
+/** Calculate one number divided by another number in percentage.
  * The result is rounded up to the next integer, and capped in the range [0,100]
  * E.g. calculatePercent(1, 100) = 1 because 1/100 = 0.010000
  *      calculatePercent(1, 99) = 2 because 1/99 = 0.010101
@@ -20,7 +19,7 @@ namespace xrpl {
  * @return the percentage, in [0, 100]
  *
  * @note total cannot be zero.
- */
+ * */
 constexpr std::size_t
 calculatePercent(std::size_t count, std::size_t total)
 {

include/xrpl/basics/Number.h

@@ -2,9 +2,7 @@
 
 #include <xrpl/beast/utility/instrumentation.h>
 
-#include <algorithm>
 #include <array>
-#include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <limits>
@@ -13,8 +11,7 @@
 #include <set>
 #include <stdexcept>
 #include <string>
-#include <type_traits>
-#include <utility>
+#include <unordered_map>
 
 namespace xrpl {
 
@@ -47,54 +44,46 @@ isPowerOfTen(T value)
 
 namespace detail {
 
-/**
- * Builds a table of the powers of 10
+/** Builds a table of the powers of 10
  *
  * This function is marked consteval, so it can only be run in
  * a constexpr context. This assures that it is and can only be run at
  * compile time. Doing it at runtime would be pretty wasteful and
  * inefficient.
  */
-constexpr std::size_t kUint64Digits = 20;
-[[maybe_unused]] constexpr std::size_t kUint128Digits = 39;
-
-template <typename T, std::size_t Digits>
-consteval std::array<T, Digits>
+constexpr std::size_t kInt64Digits = 20;
+consteval std::array<std::uint64_t, kInt64Digits>
 buildPowersOfTen()
 {
-    std::array<T, Digits> result{};
+    std::array<std::uint64_t, kInt64Digits> result{};
 
-    T power = 1;
+    std::uint64_t power = 1;
     std::size_t exponent = 0;
     // end the loop early so it doesn't overflow;
     for (; exponent < result.size() - 1; ++exponent, power *= 10)
     {
         result[exponent] = power;
-        if (power > std::numeric_limits<T>::max() / 10)
+        if (power > std::numeric_limits<std::uint64_t>::max() / 10)
             throw std::logic_error("Power of 10 table is too big");
     }
     result[exponent] = power;
-    if (power < std::numeric_limits<T>::max() / 10)
-        throw std::logic_error("Power of 10 table is not big enough for the given type");
+    if (power < std::numeric_limits<std::uint64_t>::max() / 10)
+        throw std::logic_error("Power of 10 table is not big enough for the uint64_t type");
 
     return result;
 }
 
 }  // namespace detail
 
-template <typename T = std::uint64_t, std::size_t Digits = detail::kUint64Digits>
-constexpr std::array<T, Digits> kPowerOfTenImpl = detail::buildPowersOfTen<T, Digits>();
-
-constexpr auto kPowerOfTen = kPowerOfTenImpl<std::uint64_t, detail::kUint64Digits>;
+constexpr std::array<std::uint64_t, detail::kInt64Digits> kPowerOfTen = detail::buildPowersOfTen();
 
 static_assert(kPowerOfTen[0] == 1);
 static_assert(kPowerOfTen[1] == 10);
 static_assert(kPowerOfTen[10] == 10'000'000'000);
 static_assert(
-    isPowerOfTen(kPowerOfTen.back()) && *logTen(kPowerOfTen.back()) == detail::kUint64Digits - 1);
+    isPowerOfTen(kPowerOfTen.back()) && *logTen(kPowerOfTen.back()) == detail::kInt64Digits - 1);
 
-/**
- * MantissaRange defines a range for the mantissa of a normalized Number.
+/** MantissaRange defines a range for the mantissa of a normalized Number.
  *
  * The mantissa is in the range [min, max], where
  * * min is a power of 10, and
@@ -131,37 +120,17 @@ struct MantissaRange final
 {
     using rep = std::uint64_t;
 
-    // NOLINTBEGIN(readability-enum-initial-value)
-    // The values don't matter, except for Large
     enum class MantissaScale {
-        // Small can be removed when either featureSingleAssetVault or featureLendingProtocol are
-        // retired
         Small,
         // LargeLegacy can be removed when fixCleanup3_2_0 is retired
         LargeLegacy,
-        // Large320 can be removed when fixCleanup3_3_0 is retired
-        Large320,
-        // If Large330 is ever the only remaining "Large*" entry, it can be renamed to just "Large".
-        Large330,
-        // Large is a de-facto alias for "the latest", and is only here for backward compatibility
-        // in the extremely unlikely case that a downstream project made use of it. Note that
-        // because the behavior changed, this may still be a breaking change.
-        Large = Large330,
+        Large,
     };
-    // NOLINTEND(readability-enum-initial-value)
 
-    // This entire enum can be removed when the last relevant amendment is retired
-    enum class CuspRoundingFix : std::uint8_t {
-        // Disabled can be removed when fixCleanup3_2_0 is retired
-        Disabled = 0,
-        // Enabled320 can be removed when fixCleanup3_3_0 is retired
-        Enabled320 = 1,
-        // If we ever get to the point that there's only one entry, remove the entire enum
-        Enabled330 = 2,
-        // Enabled is a de-facto alias for "the latest", and is only here for backward compatibility
-        // in the extremely unlikely case that a downstream project made use of it. Note that
-        // because the behavior changed, this may still be a breaking change.
-        Enabled = Enabled330,
+    // This entire enum can be removed when fixCleanup3_2_0 is retired
+    enum class CuspRoundingFix : bool {
+        Disabled = false,
+        Enabled = true,
     };
 
     explicit constexpr MantissaRange(MantissaScale sc) : scale(sc)
@@ -172,27 +141,13 @@ struct MantissaRange final
     int const log{getExponent(scale)};
     rep const min{getMin(scale, log)};
     rep const max{(min * 10) - 1};
-    CuspRoundingFix const cuspRoundingFix{isCuspFixEnabled(scale)};
+    CuspRoundingFix const cuspRoundingFixEnabled{isCuspFixEnabled(scale)};
+
+    static MantissaRange const&
+    getMantissaRange(MantissaScale scale);
 
     static std::set<MantissaScale> const&
-    getAllScales()
-    {
-        static std::set<MantissaRange::MantissaScale> const kScales = {
-            MantissaRange::MantissaScale::Small,
-            MantissaRange::MantissaScale::LargeLegacy,
-            MantissaRange::MantissaScale::Large320,
-            MantissaRange::MantissaScale::Large330,
-        };
-        return kScales;
-    }
-
-    class Access
-    {
-        static constexpr MantissaRange const&
-        mantissaRange(MantissaScale scale);
-
-        friend Number;
-    };
+    getAllScales();
 
 private:
     static constexpr int
@@ -203,8 +158,7 @@ private:
             case MantissaScale::Small:
                 return 15;
             case MantissaScale::LargeLegacy:
-            case MantissaScale::Large320:
-            case MantissaScale::Large330:
+            case MantissaScale::Large:
                 return 18;
             // LCOV_EXCL_START
             default:
@@ -233,24 +187,24 @@ private:
             case MantissaScale::Small:
             case MantissaScale::LargeLegacy:
                 return CuspRoundingFix::Disabled;
-            case MantissaScale::Large320:
-                return CuspRoundingFix::Enabled320;
-            case MantissaScale::Large330:
-                return CuspRoundingFix::Enabled330;
+            case MantissaScale::Large:
+                return CuspRoundingFix::Enabled;
             default:
                 // If called in a constexpr context, this throw assures that the build fails if an
                 // invalid scale is used.
                 throw std::runtime_error("Unknown mantissa scale");  // LCOV_EXCL_LINE
         }
     }
+
+    static std::unordered_map<MantissaScale, MantissaRange> const&
+    getRanges();
 };
 
 // Like std::integral, but only 64-bit integral types.
 template <class T>
 concept Integral64 = std::is_same_v<T, std::int64_t> || std::is_same_v<T, std::uint64_t>;
 
-/**
- * Number is a floating point type that can represent a wide range of values.
+/** Number is a floating point type that can represent a wide range of values.
  *
  * It can represent all values that can be represented by an STAmount -
  * regardless of asset type - XRPAmount, MPTAmount, and IOUAmount, with at least
@@ -346,6 +300,7 @@ concept Integral64 = std::is_same_v<T, std::int64_t> || std::is_same_v<T, std::u
  * disable the amendments that control the mantissa range choice
  * (SingleAssetVault and LendingProtocol), and/or check if either of those
  * amendments are enabled to determine which result to expect.
+ *
  */
 class Number final
 {
@@ -364,8 +319,6 @@ public:
     static constexpr internalrep kMaxRep = std::numeric_limits<rep>::max();
     static_assert(kMaxRep == 9'223'372'036'854'775'807);
     static_assert(-kMaxRep == std::numeric_limits<rep>::min() + 1);
-    static constexpr internalrep kMaxRepUp = ((kMaxRep / 10) + 1) * 10;
-    static_assert(kMaxRepUp == 9'223'372'036'854'775'810ULL);
 
     // May need to make unchecked private
     struct Unchecked
@@ -433,11 +386,10 @@ public:
     static Number
     lowest() noexcept;
 
-    /**
-     * Conversions to Number are implicit and conversions away from Number
-     * are explicit. This design encourages and facilitates the use of Number
-     * as the preferred type for floating point arithmetic as it makes
-     * "mixed mode" more convenient, e.g. MPTAmount + Number.
+    /** Conversions to Number are implicit and conversions away from Number
+     *  are explicit. This design encourages and facilitates the use of Number
+     *  as the preferred type for floating point arithmetic as it makes
+     *  "mixed mode" more convenient, e.g. MPTAmount + Number.
      */
     explicit
     operator rep() const;  // round to nearest, even on tie
@@ -492,9 +444,7 @@ public:
         return l.mantissa_ < r.mantissa_;
     }
 
-    /**
-     * Return the sign of the amount
-     */
+    /** Return the sign of the amount */
     [[nodiscard]] constexpr int
     signum() const noexcept
     {
@@ -548,16 +498,14 @@ public:
     static RoundingMode
     setround(RoundingMode inMode);
 
-    /**
-     * Returns which mantissa scale is currently in use for normalization.
+    /** Returns which mantissa scale is currently in use for normalization.
      *
      * If you think you need to call this outside of unit tests, no you don't.
      */
     static MantissaRange::MantissaScale
     getMantissaScale();
 
-    /**
-     * Changes which mantissa scale is used for normalization.
+    /** Changes which mantissa scale is used for normalization.
      *
      * If you think you need to call this outside of unit tests, no you don't.
      */
@@ -593,13 +541,6 @@ public:
     std::pair<T, int>
     normalizeToRange() const;
 
-    // Safely convert rep (int64) mantissa to internalrep (uint64). If the rep
-    // is negative, returns the positive value. This takes a little extra work
-    // because converting std::numeric_limits<std::int64_t>::min() flirts with
-    // UB, and can vary across compilers.
-    static internalrep
-    externalToInternal(rep mantissa);
-
 private:
     static thread_local RoundingMode mode;
     // The available ranges for mantissa
@@ -609,17 +550,10 @@ private:
     // changing the values inside the range.
     static thread_local std::reference_wrapper<MantissaRange const> kRange;
 
-    class Guard;
-
     void
     normalize(MantissaRange const& range);
 
-    // Guard has the fields that we need, as well as MantissaRange, so if we have a guard, use that
-    void
-    normalize(Guard const& guard);
-
-    /**
-     * Normalize Number components to an arbitrary range.
+    /** Normalize Number components to an arbitrary range.
      *
      * min/maxMantissa are parameters because this function is used by both
      * normalize(), which reads from kRange, and by normalizeToRange,
@@ -633,7 +567,7 @@ private:
         int& exponent,
         internalrep const& minMantissa,
         internalrep const& maxMantissa,
-        MantissaRange::CuspRoundingFix cuspRoundingFix);
+        MantissaRange::CuspRoundingFix cuspRoundingFixEnabled);
 
     template <class T>
     friend void
@@ -643,7 +577,7 @@ private:
         int& exponent,
         MantissaRange::rep const& minMantissa,
         MantissaRange::rep const& maxMantissa,
-        MantissaRange::CuspRoundingFix cuspRoundingFix,
+        MantissaRange::CuspRoundingFix cuspRoundingFixEnabled,
         bool dropped);
 
     [[nodiscard]] bool
@@ -654,6 +588,15 @@ private:
     // exponent could go out of range, so it will be checked.
     [[nodiscard]] Number
     shiftExponent(int exponentDelta) const;
+
+    // Safely convert rep (int64) mantissa to internalrep (uint64). If the rep
+    // is negative, returns the positive value. This takes a little extra work
+    // because converting std::numeric_limits<std::int64_t>::min() flirts with
+    // UB, and can vary across compilers.
+    static internalrep
+    externalToInternal(rep mantissa);
+
+    class Guard;
 };
 
 constexpr Number::Number(bool negative, internalrep mantissa, int exponent, Unchecked) noexcept
@@ -688,8 +631,7 @@ inline Number::Number(rep mantissa) : Number{mantissa, 0}
 {
 }
 
-/**
- * Returns the mantissa of the external view of the Number.
+/** Returns the mantissa of the external view of the Number.
  *
  * Please see the "---- External Interface ----" section of the class
  * documentation for an explanation of why the internal value may be modified.
@@ -710,8 +652,7 @@ Number::mantissa() const noexcept
     return sign * static_cast<Number::rep>(m);
 }
 
-/**
- * Returns the exponent of the external view of the Number.
+/** Returns the exponent of the external view of the Number.
  *
  * Please see the "---- External Interface ----" section of the class
  * documentation for an explanation of why the internal value may be modified.
@@ -917,11 +858,21 @@ squelch(Number const& x, Number const& limit) noexcept
     return x;
 }
 
-std::string
-to_string(MantissaRange::MantissaScale const& scale);
-
-std::string
-to_string(Number::RoundingMode const& round);
+inline std::string
+to_string(MantissaRange::MantissaScale const& scale)
+{
+    switch (scale)
+    {
+        case MantissaRange::MantissaScale::Small:
+            return "small";
+        case MantissaRange::MantissaScale::LargeLegacy:
+            return "largeLegacy";
+        case MantissaRange::MantissaScale::Large:
+            return "large";
+        default:
+            throw std::runtime_error("Bad scale");
+    }
+}
 
 class SaveNumberRoundMode
 {
@@ -960,10 +911,10 @@ public:
     operator=(NumberRoundModeGuard const&) = delete;
 };
 
-/**
- * Sets the new scale and restores the old scale when it leaves scope.
+/** Sets the new scale and restores the old scale when it leaves scope.
  *
  * If you think you need to use this class outside of unit tests, no you don't.
+ *
  */
 class NumberMantissaScaleGuard
 {

include/xrpl/basics/RangeSet.h

@@ -6,32 +6,29 @@
 #include <boost/icl/closed_interval.hpp>
 #include <boost/icl/interval_set.hpp>
 
-#include <functional>
 #include <optional>
 #include <string>
 #include <vector>
 
 namespace xrpl {
 
-/**
- * A closed interval over the domain T.
- *
- * For an instance ClosedInterval c, this represents the closed interval
- * (c.first(), c.last()).  A single element interval has c.first() == c.last().
- *
- * This is simply a type-alias for boost interval container library interval
- * set, so users should consult that documentation for available supporting
- * member and free functions.
- */
+/** A closed interval over the domain T.
+
+    For an instance ClosedInterval c, this represents the closed interval
+    (c.first(), c.last()).  A single element interval has c.first() == c.last().
+
+    This is simply a type-alias for boost interval container library interval
+    set, so users should consult that documentation for available supporting
+    member and free functions.
+*/
 template <class T>
 using ClosedInterval = boost::icl::closed_interval<T>;
 
-/**
- * Create a closed range interval
- *
- * Helper function to create a closed range interval without having to qualify
- * the template argument.
- */
+/** Create a closed range interval
+
+    Helper function to create a closed range interval without having to qualify
+    the template argument.
+*/
 template <class T>
 ClosedInterval<T>
 range(T low, T high)
@@ -39,30 +36,28 @@ range(T low, T high)
     return ClosedInterval<T>(low, high);
 }
 
-/**
- * A set of closed intervals over the domain T.
- *
- * Represents a set of values of the domain T using the minimum number
- * of disjoint ClosedInterval<T>.  This is useful to represent ranges of
- * T where a few instances are missing, e.g. the set 1-5,8-9,11-14.
- *
- * This is simply a type-alias for boost interval container library interval
- * set, so users should consult that documentation for available supporting
- * member and free functions.
- */
+/** A set of closed intervals over the domain T.
+
+    Represents a set of values of the domain T using the minimum number
+    of disjoint ClosedInterval<T>.  This is useful to represent ranges of
+    T where a few instances are missing, e.g. the set 1-5,8-9,11-14.
+
+    This is simply a type-alias for boost interval container library interval
+    set, so users should consult that documentation for available supporting
+    member and free functions.
+*/
 template <class T>
 using RangeSet = boost::icl::interval_set<T, std::less, ClosedInterval<T>>;
 
-/**
- * Convert a ClosedInterval to a styled string
- *
- * The styled string is
- *     "c.first()-c.last()"  if c.first() != c.last()
- *     "c.first()" if c.first() == c.last()
- *
- * @param ci The closed interval to convert
- * @return The style string
- */
+/** Convert a ClosedInterval to a styled string
+
+    The styled string is
+        "c.first()-c.last()"  if c.first() != c.last()
+        "c.first()" if c.first() == c.last()
+
+    @param ci The closed interval to convert
+    @return The style string
+*/
 template <class T>
 std::string
 to_string(ClosedInterval<T> const& ci)
@@ -72,15 +67,14 @@ to_string(ClosedInterval<T> const& ci)
     return std::to_string(ci.first()) + "-" + std::to_string(ci.last());
 }
 
-/**
- * Convert the given RangeSet to a styled string.
- *
- * The styled string representation is the set of disjoint intervals joined
- * by commas.  The string "empty" is returned if the set is empty.
- *
- * @param rs The rangeset to convert
- * @return The styled string
- */
+/** Convert the given RangeSet to a styled string.
+
+    The styled string representation is the set of disjoint intervals joined
+    by commas.  The string "empty" is returned if the set is empty.
+
+    @param rs The rangeset to convert
+    @return The styled string
+*/
 template <class T>
 std::string
 to_string(RangeSet<T> const& rs)
@@ -96,16 +90,15 @@ to_string(RangeSet<T> const& rs)
     return s;
 }
 
-/**
- * Convert the given styled string to a RangeSet.
- *
- * The styled string representation is the set
- * of disjoint intervals joined by commas.
- *
- * @param rs The set to be populated
- * @param s The styled string to convert
- * @return True on successfully converting styled string
- */
+/** Convert the given styled string to a RangeSet.
+
+    The styled string representation is the set
+    of disjoint intervals joined by commas.
+
+    @param rs The set to be populated
+    @param s The styled string to convert
+    @return True on successfully converting styled string
+*/
 template <class T>
 [[nodiscard]] bool
 fromString(RangeSet<T>& rs, std::string const& s)
@@ -167,15 +160,14 @@ fromString(RangeSet<T>& rs, std::string const& s)
     return result;
 }
 
-/**
- * Find the largest value not in the set that is less than a given value.
- *
- * @param rs The set of interest
- * @param t The value that must be larger than the result
- * @param minVal (Default is 0) The smallest allowed value
- * @return The largest v such that minV <= v < t and !contains(rs, v) or
- *         std::nullopt if no such v exists.
- */
+/** Find the largest value not in the set that is less than a given value.
+
+    @param rs The set of interest
+    @param t The value that must be larger than the result
+    @param minVal (Default is 0) The smallest allowed value
+    @return The largest v such that minV <= v < t and !contains(rs, v) or
+            std::nullopt if no such v exists.
+*/
 template <class T>
 std::optional<T>
 prevMissing(RangeSet<T> const& rs, T t, T minVal = 0)

include/xrpl/basics/Resolver.h

@@ -3,7 +3,6 @@
 #include <xrpl/beast/net/IPEndpoint.h>
 
 #include <functional>
-#include <string>
 #include <vector>
 
 namespace xrpl {
@@ -15,29 +14,22 @@ public:
 
     virtual ~Resolver() = 0;
 
-    /**
-     * Issue an asynchronous stop request.
-     */
+    /** Issue an asynchronous stop request. */
     virtual void
     stopAsync() = 0;
 
-    /**
-     * Issue a synchronous stop request.
-     */
+    /** Issue a synchronous stop request. */
     virtual void
     stop() = 0;
 
-    /**
-     * Issue a synchronous start request.
-     */
+    /** Issue a synchronous start request. */
     virtual void
     start() = 0;
 
-    /**
-     * resolve all hostnames on the list
-     * @param names the names to be resolved
-     * @param handler the handler to call
-     */
+    /** resolve all hostnames on the list
+        @param names the names to be resolved
+        @param handler the handler to call
+    */
     /** @{ */
     template <class Handler>
     void

include/xrpl/basics/ResolverAsio.h

@@ -5,8 +5,6 @@
 
 #include <boost/asio/io_context.hpp>
 
-#include <memory>
-
 namespace xrpl {
 
 class ResolverAsio : public Resolver

include/xrpl/basics/SHAMapHash.h

@@ -3,9 +3,7 @@
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/partitioned_unordered_map.h>
 
-#include <cstddef>
 #include <ostream>
-#include <string>
 
 namespace xrpl {
 

include/xrpl/basics/SharedWeakCachePointer.h

@@ -1,20 +1,17 @@
 #pragma once
 
-#include <concepts>
-#include <cstddef>
 #include <memory>
 #include <variant>
 
 namespace xrpl {
 
-/**
- * A combination of a std::shared_ptr and a std::weak_pointer.
- *
- *
- * This class is a wrapper to a `std::variant<std::shared_ptr,std::weak_ptr>`
- * This class is useful for storing intrusive pointers in tagged caches using less
- * memory than storing both pointers directly.
- */
+/** A combination of a std::shared_ptr and a std::weak_pointer.
+
+
+This class is a wrapper to a `std::variant<std::shared_ptr,std::weak_ptr>`
+This class is useful for storing intrusive pointers in tagged caches using less
+memory than storing both pointers directly.
+*/
 
 template <class T>
 class SharedWeakCachePointer
@@ -49,79 +46,65 @@ public:
 
     ~SharedWeakCachePointer();
 
-    /**
-     * Return a strong pointer if this is already a strong pointer (i.e. don't
-     * lock the weak pointer. Use the `lock` method if that's what's needed)
+    /** Return a strong pointer if this is already a strong pointer (i.e. don't
+        lock the weak pointer. Use the `lock` method if that's what's needed)
      */
     [[nodiscard]] std::shared_ptr<T> const&
     getStrong() const;
 
-    /**
-     * Return true if this is a strong pointer and the strong pointer is
-     * seated.
+    /** Return true if this is a strong pointer and the strong pointer is
+        seated.
      */
     explicit
     operator bool() const noexcept;
 
-    /**
-     * Set the pointer to null, decrement the appropriate ref count, and run
-     * the appropriate release action.
+    /** Set the pointer to null, decrement the appropriate ref count, and run
+        the appropriate release action.
      */
     void
     reset();
 
-    /**
-     * If this is a strong pointer, return the raw pointer. Otherwise return
-     * null.
+    /** If this is a strong pointer, return the raw pointer. Otherwise return
+        null.
      */
     [[nodiscard]] T*
     get() const;
 
-    /**
-     * If this is a strong pointer, return the strong count. Otherwise return 0
+    /** If this is a strong pointer, return the strong count. Otherwise return 0
      */
     [[nodiscard]] std::size_t
     useCount() const;
 
-    /**
-     * Return true if there is a non-zero strong count.
-     */
+    /** Return true if there is a non-zero strong count. */
     [[nodiscard]] bool
     expired() const;
 
-    /**
-     * If this is a strong pointer, return the strong pointer. Otherwise
-     * attempt to lock the weak pointer.
+    /** If this is a strong pointer, return the strong pointer. Otherwise
+        attempt to lock the weak pointer.
      */
     [[nodiscard]] std::shared_ptr<T>
     lock() const;
 
-    /**
-     * Return true is this represents a strong pointer.
-     */
+    /** Return true is this represents a strong pointer. */
     [[nodiscard]] bool
     isStrong() const;
 
-    /**
-     * Return true is this represents a weak pointer.
-     */
+    /** Return true is this represents a weak pointer. */
     [[nodiscard]] bool
     isWeak() const;
 
-    /**
-     * If this is a weak pointer, attempt to convert it to a strong pointer.
-     *
-     * @return true if successfully converted to a strong pointer (or was
-     *         already a strong pointer). Otherwise false.
-     */
+    /** If this is a weak pointer, attempt to convert it to a strong pointer.
+
+        @return true if successfully converted to a strong pointer (or was
+                already a strong pointer). Otherwise false.
+      */
     bool
     convertToStrong();
 
-    /**
-     * If this is a strong pointer, attempt to convert it to a weak pointer.
-     *
-     * @return false if the pointer is null. Otherwise return true.
-     */
+    /** If this is a strong pointer, attempt to convert it to a weak pointer.
+
+        @return false if the pointer is null. Otherwise return true.
+      */
     bool
     convertToWeak();
 

include/xrpl/basics/SlabAllocator.h

@@ -15,7 +15,6 @@
 #include <cstdint>
 #include <cstring>
 #include <mutex>
-#include <stdexcept>
 #include <vector>
 
 #if BOOST_OS_LINUX
@@ -33,9 +32,7 @@ class SlabAllocator
 
     static_assert(alignof(Type) == 8 || alignof(Type) == 4);
 
-    /**
-     * A block of memory that is owned by a slab allocator
-     */
+    /** A block of memory that is owned by a slab allocator */
     struct SlabBlock
     {
         // A mutex to protect the freelist for this block:
@@ -82,9 +79,7 @@ class SlabAllocator
         SlabBlock&
         operator=(SlabBlock&& other) = delete;
 
-        /**
-         * Determines whether the given pointer belongs to this allocator
-         */
+        /** Determines whether the given pointer belongs to this allocator */
         bool
         own(std::uint8_t const* pIn) const noexcept
         {
@@ -111,15 +106,14 @@ class SlabAllocator
             return ret;
         }
 
-        /**
-         * Return an item to this allocator's freelist.
-         *
-         * @param ptr The pointer to the chunk of memory being deallocated.
-         *
-         * @note This is a dangerous, private interface; the item being
-         *       returned should belong to this allocator. Debug builds
-         *       will check and assert if this is not the case. Release
-         *       builds will not.
+        /** Return an item to this allocator's freelist.
+
+            @param ptr The pointer to the chunk of memory being deallocated.
+
+            @note This is a dangerous, private interface; the item being
+                  returned should belong to this allocator. Debug builds
+                  will check and assert if this is not the case. Release
+                  builds will not.
          */
         void
         deallocate(std::uint8_t* ptr) noexcept
@@ -150,14 +144,13 @@ private:
     std::size_t const slabSize_;
 
 public:
-    /**
-     * Constructs a slab allocator able to allocate objects of a fixed size
-     *
-     * @param count the number of items the slab allocator can allocate; note
-     *              that a count of 0 is valid and means that the allocator
-     *              is, effectively, disabled. This can be very useful in some
-     *              contexts (e.g. when minimal memory usage is needed) and
-     *              allows for graceful failure.
+    /** Constructs a slab allocator able to allocate objects of a fixed size
+
+        @param count the number of items the slab allocator can allocate; note
+                     that a count of 0 is valid and means that the allocator
+                     is, effectively, disabled. This can be very useful in some
+                     contexts (e.g. when minimal memory usage is needed) and
+                     allows for graceful failure.
      */
     constexpr explicit SlabAllocator(
         std::size_t extra,
@@ -185,20 +178,17 @@ public:
     //        shutdown process up could make this possible.
     ~SlabAllocator() = default;
 
-    /**
-     * Returns the size of the memory block this allocator returns.
-     */
+    /** Returns the size of the memory block this allocator returns. */
     [[nodiscard]] constexpr std::size_t
     size() const noexcept
     {
         return itemSize_;
     }
 
-    /**
-     * Returns a suitably aligned pointer, if one is available.
-     *
-     * @return a pointer to a block of memory from the allocator, or
-     *         nullptr if the allocator can't satisfy this request.
+    /** Returns a suitably aligned pointer, if one is available.
+
+        @return a pointer to a block of memory from the allocator, or
+                nullptr if the allocator can't satisfy this request.
      */
     std::uint8_t*
     allocate() noexcept
@@ -259,13 +249,12 @@ public:
         return slab->allocate();
     }
 
-    /**
-     * Returns the memory block to the allocator.
-     *
-     * @param ptr A pointer to a memory block.
-     * @param size If non-zero, a hint as to the size of the block.
-     * @return true if this memory block belonged to the allocator and has
-     *              been released; false otherwise.
+    /** Returns the memory block to the allocator.
+
+        @param ptr A pointer to a memory block.
+        @param size If non-zero, a hint as to the size of the block.
+        @return true if this memory block belonged to the allocator and has
+                     been released; false otherwise.
      */
     bool
     deallocate(std::uint8_t* ptr) noexcept
@@ -288,9 +277,7 @@ public:
     }
 };
 
-/**
- * A collection of slab allocators of various sizes for a given type.
- */
+/** A collection of slab allocators of various sizes for a given type. */
 template <typename Type>
 class SlabAllocatorSet
 {
@@ -357,14 +344,13 @@ public:
 
     ~SlabAllocatorSet() = default;
 
-    /**
-     * Returns a suitably aligned pointer, if one is available.
-     *
-     * @param extra The number of extra bytes, above and beyond the size of
-     *              the object, that should be returned by the allocator.
-     *
-     * @return a pointer to a block of memory, or nullptr if the allocator
-     *         can't satisfy this request.
+    /** Returns a suitably aligned pointer, if one is available.
+
+        @param extra The number of extra bytes, above and beyond the size of
+                     the object, that should be returned by the allocator.
+
+        @return a pointer to a block of memory, or nullptr if the allocator
+                can't satisfy this request.
      */
     std::uint8_t*
     allocate(std::size_t extra) noexcept
@@ -381,13 +367,12 @@ public:
         return nullptr;
     }
 
-    /**
-     * Returns the memory block to the allocator.
-     *
-     * @param ptr A pointer to a memory block.
-     *
-     * @return true if this memory block belonged to one of the allocators
-     *              in this set and has been released; false otherwise.
+    /** Returns the memory block to the allocator.
+
+        @param ptr A pointer to a memory block.
+
+        @return true if this memory block belonged to one of the allocators
+                     in this set and has been released; false otherwise.
      */
     bool
     deallocate(std::uint8_t* ptr) noexcept

include/xrpl/basics/Slice.h

@@ -16,13 +16,12 @@
 
 namespace xrpl {
 
-/**
- * An immutable linear range of bytes.
- *
- * A fully constructed Slice is guaranteed to be in a valid state.
- * A Slice is lightweight and copyable, it retains no ownership
- * of the underlying memory.
- */
+/** An immutable linear range of bytes.
+
+    A fully constructed Slice is guaranteed to be in a valid state.
+    A Slice is lightweight and copyable, it retains no ownership
+    of the underlying memory.
+*/
 class Slice
 {
 private:
@@ -33,37 +32,30 @@ public:
     using value_type = std::uint8_t;
     using const_iterator = value_type const*;
 
-    /**
-     * Default constructed Slice has length 0.
-     */
+    /** Default constructed Slice has length 0. */
     Slice() noexcept = default;
 
     Slice(Slice const&) noexcept = default;
     Slice&
     operator=(Slice const&) noexcept = default;
 
-    /**
-     * Create a slice pointing to existing memory.
-     */
+    /** Create a slice pointing to existing memory. */
     Slice(void const* data, std::size_t size) noexcept
         : data_(reinterpret_cast<std::uint8_t const*>(data)), size_(size)
     {
     }
 
-    /**
-     * Return `true` if the byte range is empty.
-     */
+    /** Return `true` if the byte range is empty. */
     [[nodiscard]] bool
     empty() const noexcept
     {
         return size_ == 0;
     }
 
-    /**
-     * Returns the number of bytes in the storage.
-     *
-     * This may be zero for an empty range.
-     */
+    /** Returns the number of bytes in the storage.
+
+        This may be zero for an empty range.
+    */
     /** @{ */
     [[nodiscard]] std::size_t
     size() const noexcept
@@ -78,20 +70,17 @@ public:
     }
     /** @} */
 
-    /**
-     * Return a pointer to beginning of the storage.
-     * @note The return type is guaranteed to be a pointer
-     *       to a single byte, to facilitate pointer arithmetic.
-     */
+    /** Return a pointer to beginning of the storage.
+        @note The return type is guaranteed to be a pointer
+              to a single byte, to facilitate pointer arithmetic.
+    */
     [[nodiscard]] std::uint8_t const*
     data() const noexcept
     {
         return data_;
     }
 
-    /**
-     * Access raw bytes.
-     */
+    /** Access raw bytes. */
     std::uint8_t
     operator[](std::size_t i) const noexcept
     {
@@ -99,9 +88,7 @@ public:
         return data_[i];
     }
 
-    /**
-     * Advance the buffer.
-     */
+    /** Advance the buffer. */
     /** @{ */
     Slice&
     operator+=(std::size_t n)
@@ -121,9 +108,7 @@ public:
     }
     /** @} */
 
-    /**
-     * Shrinks the slice by moving its start forward by n characters.
-     */
+    /** Shrinks the slice by moving its start forward by n characters. */
     void
     removePrefix(std::size_t n)
     {
@@ -131,9 +116,7 @@ public:
         size_ -= n;
     }
 
-    /**
-     * Shrinks the slice by moving its end backward by n characters.
-     */
+    /** Shrinks the slice by moving its end backward by n characters. */
     void
     removeSuffix(std::size_t n)
     {
@@ -164,17 +147,16 @@ public:
         return data_ + size_;
     }
 
-    /**
-     * Return a "sub slice" of given length starting at the given position
-     *
-     * Note that the subslice encompasses the range [pos, pos + rCount),
-     * where rCount is the smaller of count and size() - pos.
-     *
-     * @param pos position of the first character
-     * @count requested length
-     *
-     * @return The requested subslice, if the request is valid.
-     * @throws std::out_of_range if pos > size()
+    /** Return a "sub slice" of given length starting at the given position
+
+        Note that the subslice encompasses the range [pos, pos + rCount),
+        where rCount is the smaller of count and size() - pos.
+
+        @param pos position of the first character
+        @count requested length
+
+        @returns The requested subslice, if the request is valid.
+        @throws std::out_of_range if pos > size()
      */
     [[nodiscard]] Slice
     substr(std::size_t pos, std::size_t count = std::numeric_limits<std::size_t>::max()) const
@@ -229,17 +211,15 @@ operator<<(Stream& s, Slice const& v)
 }
 
 template <class T, std::size_t N>
-Slice
+std::enable_if_t<std::is_same_v<T, char> || std::is_same_v<T, unsigned char>, Slice>
 makeSlice(std::array<T, N> const& a)
-    requires(std::is_same_v<T, char> || std::is_same_v<T, unsigned char>)
 {
     return Slice(a.data(), a.size());
 }
 
 template <class T, class Alloc>
-Slice
+std::enable_if_t<std::is_same_v<T, char> || std::is_same_v<T, unsigned char>, Slice>
 makeSlice(std::vector<T, Alloc> const& v)
-    requires(std::is_same_v<T, char> || std::is_same_v<T, unsigned char>)
 {
     return Slice(v.data(), v.size());
 }

include/xrpl/basics/StringUtilities.h

@@ -1,32 +1,30 @@
 #pragma once
 
 #include <xrpl/basics/Blob.h>
+#include <xrpl/basics/strHex.h>
 
 #include <boost/format.hpp>
 #include <boost/utility/string_view.hpp>
 
 #include <array>
 #include <concepts>
-#include <cstddef>
 #include <cstdint>
 #include <optional>
 #include <string>
 #include <string_view>
 #include <type_traits>
-#include <utility>
 
 namespace xrpl {
 
-/**
- * Format arbitrary binary data as an SQLite "blob literal".
- *
- * In SQLite, blob literals must be encoded when used in a query. Per
- * https://sqlite.org/lang_expr.html#literal_values_constants_ they are
- * encoded as string literals containing hexadecimal data and preceded
- * by a single 'X' character.
- *
- * @param blob An arbitrary blob of binary data
- * @return The input, encoded as a blob literal.
+/** Format arbitrary binary data as an SQLite "blob literal".
+
+    In SQLite, blob literals must be encoded when used in a query. Per
+    https://sqlite.org/lang_expr.html#literal_values_constants_ they are
+    encoded as string literals containing hexadecimal data and preceded
+    by a single 'X' character.
+
+    @param blob An arbitrary blob of binary data
+    @return The input, encoded as a blob literal.
  */
 std::string
 sqlBlobLiteral(Blob const& blob);
@@ -131,12 +129,11 @@ trimWhitespace(std::string str);
 std::optional<std::uint64_t>
 toUInt64(std::string const& s);
 
-/**
- * Determines if the given string looks like a TOML-file hosting domain.
- *
- * Do not use this function to determine if a particular string is a valid
- * domain, as this function may reject domains that are otherwise valid and
- * doesn't check whether the TLD is valid.
+/** Determines if the given string looks like a TOML-file hosting domain.
+
+    Do not use this function to determine if a particular string is a valid
+    domain, as this function may reject domains that are otherwise valid and
+    doesn't check whether the TLD is valid.
  */
 bool
 isProperlyFormedTomlDomain(std::string_view domain);

include/xrpl/basics/TaggedCache.h

@@ -1,24 +1,17 @@
 #pragma once
 
-#include <xrpl/basics/SharedWeakCachePointer.h>
-#include <xrpl/basics/SharedWeakCachePointer.ipp>  // IWYU pragma: keep
+#include <xrpl/basics/IntrusivePointer.h>
+#include <xrpl/basics/Log.h>
+#include <xrpl/basics/SharedWeakCachePointer.ipp>
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/hardened_hash.h>
 #include <xrpl/beast/clock/abstract_clock.h>
-#include <xrpl/beast/insight/Collector.h>
-#include <xrpl/beast/insight/Gauge.h>
-#include <xrpl/beast/insight/Hook.h>
-#include <xrpl/beast/insight/NullCollector.h>
-#include <xrpl/beast/utility/Journal.h>
+#include <xrpl/beast/insight/Insight.h>
 
 #include <atomic>
-#include <chrono>
 #include <cstddef>
-#include <cstdint>
 #include <functional>
-#include <memory>
 #include <mutex>
-#include <string>
 #include <thread>
 #include <type_traits>
 #include <vector>
@@ -41,19 +34,18 @@ struct ReplaceDynamically;
 
 }  // namespace detail
 
-/**
- * Map/cache combination.
- * This class implements a cache and a map. The cache keeps objects alive
- * in the map. The map allows multiple code paths that reference objects
- * with the same tag to get the same actual object.
- *
- * So long as data is in the cache, it will stay in memory.
- * If it stays in memory even after it is ejected from the cache,
- * the map will track it.
- *
- * @note Callers must not modify data objects that are stored in the cache
- *       unless they hold their own lock over all cache operations.
- */
+/** Map/cache combination.
+    This class implements a cache and a map. The cache keeps objects alive
+    in the map. The map allows multiple code paths that reference objects
+    with the same tag to get the same actual object.
+
+    So long as data is in the cache, it will stay in memory.
+    If it stays in memory even after it is ejected from the cache,
+    the map will track it.
+
+    @note Callers must not modify data objects that are stored in the cache
+          unless they hold their own lock over all cache operations.
+*/
 template <
     class Key,
     class T,
@@ -83,15 +75,11 @@ public:
         beast::insight::Collector::ptr const& collector = beast::insight::NullCollector::make());
 
 public:
-    /**
-     * Return the clock associated with the cache.
-     */
+    /** Return the clock associated with the cache. */
     clock_type&
     clock();
 
-    /**
-     * Returns the number of items in the container.
-     */
+    /** Returns the number of items in the container. */
     std::size_t
     size() const;
 
@@ -110,10 +98,9 @@ public:
     void
     reset();
 
-    /**
-     * Refresh the last access time on a key if present.
-     * @return `true` If the key was found.
-     */
+    /** Refresh the last access time on a key if present.
+        @return `true` If the key was found.
+    */
     template <class KeyComparable>
     bool
     touchIfExists(KeyComparable const& key);
@@ -136,15 +123,14 @@ private:
         SharedPointerType const&,
         SharedPointerType&>;
 
-    /**
-     * Shared implementation of the canonicalize family.
-     *
-     * `policy` selects how a collision is resolved when `key` already exists:
-     * detail::ReplaceCached, detail::ReplaceClient or
-     * detail::ReplaceDynamically. For ReplaceDynamically `replaceCallback` is
-     * invoked with the existing strong pointer and returns whether to replace
-     * the cached value with `data`; for the tag policies it is unused.
-     */
+    /** Shared implementation of the canonicalize family.
+
+        `policy` selects how a collision is resolved when `key` already exists:
+        detail::ReplaceCached, detail::ReplaceClient or
+        detail::ReplaceDynamically. For ReplaceDynamically `replaceCallback` is
+        invoked with the existing strong pointer and returns whether to replace
+        the cached value with `data`; for the tag policies it is unused.
+    */
     template <class Policy, class Callback = std::nullptr_t>
     bool
     canonicalizeImpl(
@@ -154,82 +140,76 @@ private:
         Callback&& replaceCallback = nullptr);
 
 public:
-    /**
-     * Replace aliased objects with originals.
-     *
-     * Due to concurrency it is possible for two separate objects with
-     * the same content and referring to the same unique "thing" to exist.
-     * This routine eliminates the duplicate and performs a replacement
-     * on the callers shared pointer if needed.
-     *
-     * `replaceCallback` is a callable taking the existing strong pointer and
-     * returning whether to replace the cached value with `data` (true) or to
-     * keep the cached value and write it back into `data` (false). Because the
-     * write-back case mutates `data`, `data` must be writable.
-     *
-     * @param key The key corresponding to the object
-     * @param data A shared pointer to the data corresponding to the object.
-     * @param replaceCallback A callable (existing strong pointer -> bool).
-     *
-     * @return `true` if an existing live entry was found and used; `false` if a new entry was
-     *         inserted or an expired tracked entry was re-cached.
-     */
+    /** Replace aliased objects with originals.
+
+        Due to concurrency it is possible for two separate objects with
+        the same content and referring to the same unique "thing" to exist.
+        This routine eliminates the duplicate and performs a replacement
+        on the callers shared pointer if needed.
+
+        `replaceCallback` is a callable taking the existing strong pointer and
+        returning whether to replace the cached value with `data` (true) or to
+        keep the cached value and write it back into `data` (false). Because the
+        write-back case mutates `data`, `data` must be writable.
+
+        @param key The key corresponding to the object
+        @param data A shared pointer to the data corresponding to the object.
+        @param replaceCallback A callable (existing strong pointer -> bool).
+
+        @return `true` if an existing live entry was found and used; `false` if a new entry was
+                inserted or an expired tracked entry was re-cached.
+    **/
     template <class Callback>
     bool
     canonicalize(key_type const& key, SharedPointerType& data, Callback&& replaceCallback);
 
-    /**
-     * Insert/update the canonical entry for `key`, always replacing the
-     * cached value with `data`.
-     *
-     * If an entry already exists for `key`, the cached value is unconditionally
-     * replaced with `data`; otherwise `data` is inserted. `data` is never
-     * written back, so it may be const.
-     *
-     * @param key The key corresponding to the object.
-     * @param data A shared pointer to the data corresponding to the object.
-     *
-     * @return `true` if an existing live entry was found and used; `false` if a new entry was
-     *         inserted or an expired tracked entry was re-cached.
-     */
+    /** Insert/update the canonical entry for `key`, always replacing the
+        cached value with `data`.
+
+        If an entry already exists for `key`, the cached value is unconditionally
+        replaced with `data`; otherwise `data` is inserted. `data` is never
+        written back, so it may be const.
+
+        @param key The key corresponding to the object.
+        @param data A shared pointer to the data corresponding to the object.
+
+        @return `true` if an existing live entry was found and used; `false` if a new entry was
+                inserted or an expired tracked entry was re-cached.
+    **/
     bool
     canonicalizeReplaceCache(key_type const& key, SharedPointerType const& data);
 
-    /**
-     * Insert the canonical entry for `key`, keeping any existing cached value.
-     *
-     * If an entry already exists for `key`, the cached value is kept and
-     * written back into `data` so the caller ends up with the canonical
-     * object; otherwise `data` is inserted. Because `data` may be overwritten
-     * it must be writable.
-     *
-     * @param key The key corresponding to the object.
-     * @param data A shared pointer to the data corresponding to the object;
-     *             updated to the canonical value when one already exists.
-     *
-     * @return `true` if an existing live entry was found and used; `false` if a new entry was
-     *         inserted or an expired tracked entry was re-cached.
-     */
+    /** Insert the canonical entry for `key`, keeping any existing cached value.
+
+        If an entry already exists for `key`, the cached value is kept and
+        written back into `data` so the caller ends up with the canonical
+        object; otherwise `data` is inserted. Because `data` may be overwritten
+        it must be writable.
+
+        @param key The key corresponding to the object.
+        @param data A shared pointer to the data corresponding to the object;
+                    updated to the canonical value when one already exists.
+
+        @return `true` if an existing live entry was found and used; `false` if a new entry was
+                inserted or an expired tracked entry was re-cached.
+    **/
     bool
     canonicalizeReplaceClient(key_type const& key, SharedPointerType& data);
 
     SharedPointerType
     fetch(key_type const& key);
 
-    /**
-     * Insert the element into the container.
-     * If the key already exists, nothing happens.
-     * @return `true` If the element was inserted
-     */
+    /** Insert the element into the container.
+        If the key already exists, nothing happens.
+        @return `true` If the element was inserted
+    */
     template <class ReturnType = bool>
     auto
-    insert(key_type const& key, T const& value) -> ReturnType
-        requires(!IsKeyCache);
+    insert(key_type const& key, T const& value) -> std::enable_if_t<!IsKeyCache, ReturnType>;
 
     template <class ReturnType = bool>
     auto
-    insert(key_type const& key) -> ReturnType
-        requires IsKeyCache;
+    insert(key_type const& key) -> std::enable_if_t<IsKeyCache, ReturnType>;
 
     // VFALCO NOTE It looks like this returns a copy of the data in
     //             the output parameter 'data'. This could be expensive.
@@ -246,18 +226,15 @@ public:
     getKeys() const;
 
     // CachedSLEs functions.
-    /**
-     * Returns the fraction of cache hits.
-     */
+    /** Returns the fraction of cache hits. */
     double
     rate() const;
 
-    /**
-     * Fetch an item from the cache.
-     * If the digest was not found, Handler
-     * will be called with this signature:
-     *     SLE::const_pointer(void)
-     */
+    /** Fetch an item from the cache.
+        If the digest was not found, Handler
+        will be called with this signature:
+            SLE::const_pointer(void)
+    */
     template <class Handler>
     SharedPointerType
     fetch(key_type const& digest, Handler const& h);

include/xrpl/basics/TaggedCache.ipp

@@ -1,11 +1,7 @@
 #pragma once
 
 #include <xrpl/basics/IntrusivePointer.ipp>
-#include <xrpl/basics/Log.h>  // IWYU pragma: keep
 #include <xrpl/basics/TaggedCache.h>
-#include <xrpl/basics/scope.h>
-
-#include <algorithm>
 
 namespace xrpl {
 
@@ -60,10 +56,7 @@ inline TaggedCache<
         beast::insight::Collector::ptr const& collector)
     : journal_(journal)
     , clock_(clock)
-    , stats_(
-          name,
-          [this] { collectMetrics(); },
-          collector)
+    , stats_(name, std::bind(&TaggedCache::collectMetrics, this), collector)
     , name_(name)
     , targetSize_(size)
     , targetAge_(expiration)
@@ -506,8 +499,7 @@ template <
 template <class ReturnType>
 inline auto
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
-    insert(key_type const& key, T const& value) -> ReturnType
-    requires(!IsKeyCache)
+    insert(key_type const& key, T const& value) -> std::enable_if_t<!IsKeyCache, ReturnType>
 {
     static_assert(
         std::is_same_v<std::shared_ptr<T>, SharedPointerType> ||
@@ -537,8 +529,7 @@ template <
 template <class ReturnType>
 inline auto
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
-    insert(key_type const& key) -> ReturnType
-    requires IsKeyCache
+    insert(key_type const& key) -> std::enable_if_t<IsKeyCache, ReturnType>
 {
     std::scoped_lock const lock(mutex_);
     clock_type::time_point const now(clock_.now());
@@ -604,42 +595,8 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
     std::vector<key_type> v;
 
     {
-        // Keep track of how many iterations are needed. Exit the loop if the number of retries gets
-        // absurd. (Note that if this somehow ever happens, one more allocation will be done under
-        // lock, which is undesirable, but really should be almost impossible.)
-        std::size_t allocationIterations = 0;
-        std::unique_lock lock(mutex_);
-        for (auto size = cache_.size(); v.capacity() < size && allocationIterations < 20;
-             size = cache_.size())
-        {
-            ScopeUnlock const unlock(lock);
-            if (allocationIterations > 0)
-            {
-                JLOG(journal_.info())
-                    << "getKeys(): Cache grew beyond allocated capacity after "
-                    << allocationIterations << " prior attempt(s). Have " << v.capacity()
-                    << ", need " << size << ". Retrying allocation";
-            }
-            // Allocate the current size plus a little extra, in case the cache grows while
-            // allocating. Each time another allocation is needed, the extra also gets bigger until
-            // it ultimately doubles the size + 1.
-            constexpr std::size_t baseShift = 5;
-            auto const bufferOffset = std::min(allocationIterations, std::size_t{baseShift});
-            auto const bufferShift = baseShift - bufferOffset;
-            size += (size >> bufferShift) + 1;
-            v.reserve(size);
-            ++allocationIterations;
-        }
-        if (v.capacity() < cache_.size())
-        {
-            // LCOV_EXCL_START
-            UNREACHABLE("xrpl::TaggedCache::getKeys(): failed to allocate sufficient capacity");
-            v.reserve(cache_.size());
-            // LCOV_EXCL_STOP
-        }
-        XRPL_ASSERT(lock.owns_lock(), "xrpl::TaggedCache::getKeys(): owns lock");
-        XRPL_ASSERT(
-            v.capacity() >= cache_.size(), "xrpl::TaggedCache::getKeys(): sufficient capacity");
+        std::scoped_lock const lock(mutex_);
+        v.reserve(cache_.size());
         for (auto const& _ : cache_)
             v.push_back(_.first);
     }

include/xrpl/basics/ToString.h

@@ -5,17 +5,15 @@
 
 namespace xrpl {
 
-/**
- * to_string() generalizes std::to_string to handle bools, chars, and strings.
- *
- * It's also possible to provide implementation of to_string for a class
- * which needs a string implementation.
+/** to_string() generalizes std::to_string to handle bools, chars, and strings.
+
+    It's also possible to provide implementation of to_string for a class
+    which needs a string implementation.
  */
 
 template <class T>
-std::string
+std::enable_if_t<std::is_arithmetic_v<T>, std::string>
 to_string(T t)  // NOLINT(readability-identifier-naming)
-    requires(std::is_arithmetic_v<T>)
 {
     return std::to_string(t);
 }

include/xrpl/basics/UnorderedContainers.h

@@ -2,14 +2,12 @@
 
 #include <xrpl/basics/hardened_hash.h>
 #include <xrpl/basics/partitioned_unordered_map.h>
+#include <xrpl/beast/hash/hash_append.h>
 #include <xrpl/beast/hash/uhash.h>
 #include <xrpl/beast/hash/xxhasher.h>
 
-#include <functional>
-#include <memory>
 #include <unordered_map>
 #include <unordered_set>
-#include <utility>
 
 /**
  * Use hash_* containers for keys that do not need a cryptographically secure

include/xrpl/basics/UptimeClock.h

@@ -7,13 +7,12 @@
 
 namespace xrpl {
 
-/**
- * Tracks program uptime to seconds precision.
- *
- * The timer caches the current time as a performance optimization.
- * This allows clients to query the current time thousands of times
- * per second.
- */
+/** Tracks program uptime to seconds precision.
+
+    The timer caches the current time as a performance optimization.
+    This allows clients to query the current time thousands of times
+    per second.
+*/
 
 class UptimeClock
 {

include/xrpl/basics/base64.h

@@ -34,7 +34,6 @@
 
 #pragma once
 
-#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <string_view>

include/xrpl/basics/base_uint.h

@@ -10,7 +10,6 @@
 #include <xrpl/basics/hardened_hash.h>
 #include <xrpl/basics/partitioned_unordered_map.h>
 #include <xrpl/basics/strHex.h>
-#include <xrpl/beast/hash/hash_append.h>
 #include <xrpl/beast/utility/Zero.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
@@ -19,17 +18,8 @@
 
 #include <algorithm>
 #include <array>
-#include <compare>
-#include <cstddef>
-#include <cstdint>
 #include <cstring>
 #include <expected>
-#include <iterator>
-#include <optional>
-#include <ostream>
-#include <stdexcept>
-#include <string>
-#include <string_view>
 #include <type_traits>
 
 namespace xrpl {
@@ -63,19 +53,18 @@ struct AlwaysFalseT : std::bool_constant<false>
 
 }  // namespace detail
 
-/**
- * Integers of any length that is a multiple of 32-bits
- *
- * @note This class stores its values internally in big-endian
- *       form and that internal representation is part of the
- *       binary protocol of the XRP Ledger and cannot be changed
- *       arbitrarily without causing breakage.
- *
- * @tparam Bits The number of bits this integer should have; must
- *              be at least 64 and a multiple of 32.
- * @tparam Tag An arbitrary type that functions as a tag and allows
- *             the instantiation of "distinct" types that the same
- *             number of bits.
+/** Integers of any length that is a multiple of 32-bits
+
+    @note This class stores its values internally in big-endian
+          form and that internal representation is part of the
+          binary protocol of the XRP Ledger and cannot be changed
+          arbitrarily without causing breakage.
+
+          @tparam Bits The number of bits this integer should have; must
+                       be at least 64 and a multiple of 32.
+          @tparam Tag An arbitrary type that functions as a tag and allows
+                      the instantiation of "distinct" types that the same
+                      number of bits.
  */
 template <std::size_t Bits, class Tag = void>
 class BaseUInt
@@ -98,7 +87,7 @@ public:
     //
 
     static constexpr std::size_t kBytes = Bits / 8;
-    static_assert(sizeof(data_) == kBytes);
+    static_assert(sizeof(data_) == kBytes, "");
 
     using size_type = std::size_t;
     using difference_type = std::ptrdiff_t;
@@ -155,23 +144,21 @@ public:
         return data() + kBytes;
     }
 
-    /**
-     * Value hashing function.
-     *  The seed prevents crafted inputs from causing degenerate parent
-     * containers.
-     */
+    /** Value hashing function.
+        The seed prevents crafted inputs from causing degenerate parent
+       containers.
+    */
     using hasher = HardenedHash<>;
 
     //--------------------------------------------------------------------------
 
 private:
-    /**
-     * Construct from a raw pointer.
-     * The buffer pointed to by `data` must be at least Bits/8 bytes.
-     *
-     * @note the structure is used to disambiguate this from the std::uint64_t
-     *       constructor: something like base_uint(0) is ambiguous.
-     */
+    /** Construct from a raw pointer.
+        The buffer pointed to by `data` must be at least Bits/8 bytes.
+
+        @note the structure is used to disambiguate this from the std::uint64_t
+              constructor: something like base_uint(0) is ambiguous.
+    */
     // NIKB TODO Remove the need for this constructor.
     struct VoidHelper
     {
@@ -283,11 +270,12 @@ public:
     {
     }
 
-    template <class Container>
-    explicit BaseUInt(Container const& c)
-        requires(
+    template <
+        class Container,
+        class = std::enable_if_t<
             detail::IsContiguousContainer<Container>::value &&
-            std::is_trivially_copyable_v<typename Container::value_type>)
+            std::is_trivially_copyable_v<typename Container::value_type>>>
+    explicit BaseUInt(Container const& c)
     {
         // Use AlwaysFalseT so the static_assert condition is dependent
         // and only triggers when this constructor template is instantiated.
@@ -297,38 +285,33 @@ public:
             "Use base_uint::fromRaw instead.");
     }
 
-    template <class Container>
+    template <
+        class Container,
+        class = std::enable_if_t<
+            detail::IsContiguousContainer<Container>::value &&
+            std::is_trivially_copyable_v<typename Container::value_type>>>
     static BaseUInt
     fromRaw(Container const& c)
-        requires(
-            detail::IsContiguousContainer<Container>::value &&
-            std::is_trivially_copyable_v<typename Container::value_type>)
     {
         BaseUInt result;
         XRPL_ASSERT(
             c.size() * sizeof(typename Container::value_type) == size(),
             "xrpl::BaseUInt::fromRaw(Container auto) : input size match");
-        std::size_t const canCopy =
-            std::min(size(), c.size() * sizeof(typename Container::value_type));
-        std::memcpy(result.data_.data(), c.data(), canCopy);
+        std::memcpy(result.data_.data(), c.data(), size());
         return result;
     }
 
     template <class Container>
-    BaseUInt&
+    std::enable_if_t<
+        detail::IsContiguousContainer<Container>::value &&
+            std::is_trivially_copyable_v<typename Container::value_type>,
+        BaseUInt&>
     operator=(Container const& c)
-        requires(
-            detail::IsContiguousContainer<Container>::value &&
-            std::is_trivially_copyable_v<typename Container::value_type>)
     {
         XRPL_ASSERT(
             c.size() * sizeof(typename Container::value_type) == size(),
             "xrpl::BaseUInt::operator=(Container auto) : input size match");
-        std::size_t const canCopy =
-            std::min(size(), c.size() * sizeof(typename Container::value_type));
-        if (canCopy < size())
-            *this = beast::kZero;
-        std::memcpy(data_.data(), c.data(), canCopy);
+        std::memcpy(data_.data(), c.data(), size());
         return *this;
     }
 
@@ -512,14 +495,13 @@ public:
         h(a.data_.data(), sizeof(a.data_));
     }
 
-    /**
-     * Parse a hex string into a base_uint
-     *
-     * The input must be precisely `2 * bytes` hexadecimal characters
-     * long, with one exception: the value '0'.
-     *
-     * @param sv A null-terminated string of hexadecimal characters
-     * @return true if the input was parsed properly; false otherwise.
+    /** Parse a hex string into a base_uint
+
+        The input must be precisely `2 * bytes` hexadecimal characters
+        long, with one exception: the value '0'.
+
+        @param sv A null-terminated string of hexadecimal characters
+        @return true if the input was parsed properly; false otherwise.
      */
     [[nodiscard]] constexpr bool
     parseHex(std::string_view sv)
@@ -605,7 +587,7 @@ template <std::size_t Bits, typename Tag>
 [[nodiscard]] constexpr bool
 operator==(BaseUInt<Bits, Tag> const& lhs, BaseUInt<Bits, Tag> const& rhs)
 {
-    return (lhs <=> rhs) == 0;  // NOLINT(modernize-use-nullptr)
+    return (lhs <=> rhs) == 0;
 }
 
 //------------------------------------------------------------------------------

include/xrpl/basics/chrono.h

@@ -10,7 +10,6 @@
 #include <cstdint>
 #include <ratio>
 #include <string>
-#include <type_traits>
 
 namespace xrpl {
 
@@ -21,16 +20,15 @@ using days =
 
 using weeks = std::chrono::duration<int, std::ratio_multiply<days::period, std::ratio<7>>>;
 
-/**
- * Clock for measuring the network time.
- *
- * The epoch is January 1, 2000
- *
- * epoch_offset
- * = date(2000-01-01) - date(1970-0-01)
- * = days(10957)
- * = seconds(946684800)
- */
+/** Clock for measuring the network time.
+
+    The epoch is January 1, 2000
+
+    epoch_offset
+    = date(2000-01-01) - date(1970-0-01)
+    = days(10957)
+    = seconds(946684800)
+*/
 
 static constexpr std::chrono::seconds kEpochOffset =
     date::sys_days{date::year{2000} / 1 / 1} - date::sys_days{date::year{1970} / 1 / 1};
@@ -82,21 +80,16 @@ toStringIso(NetClock::time_point tp)
     return toStringIso(date::sys_time<NetClock::duration>{tp.time_since_epoch() + kEpochOffset});
 }
 
-/**
- * A clock for measuring elapsed time.
- *
- * The epoch is unspecified.
- */
+/** A clock for measuring elapsed time.
+
+    The epoch is unspecified.
+*/
 using Stopwatch = beast::AbstractClock<std::chrono::steady_clock>;
 
-/**
- * A manual Stopwatch for unit tests.
- */
+/** A manual Stopwatch for unit tests. */
 using TestStopwatch = beast::ManualClock<std::chrono::steady_clock>;
 
-/**
- * Returns an instance of a wall clock.
- */
+/** Returns an instance of a wall clock. */
 inline Stopwatch&
 stopwatch()
 {

include/xrpl/basics/comparators.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include <functional>
+
+namespace xrpl {
+
+#ifdef _MSC_VER
+
+/*
+ * MSVC 2019 version 16.9.0 added [[nodiscard]] to the std comparison
+ * operator() functions. boost::bimap checks that the comparator is a
+ * BinaryFunction, in part by calling the function and ignoring the value.
+ * These two things don't play well together. These wrapper classes simply
+ * strip [[nodiscard]] from operator() for use in boost::bimap.
+ *
+ * See also:
+ *  https://www.boost.org/doc/libs/1_75_0/libs/bimap/doc/html/boost_bimap/the_tutorial/controlling_collection_types.html
+ */
+
+template <class T = void>
+struct less
+{
+    using result_type = bool;
+
+    constexpr bool
+    operator()(T const& left, T const& right) const
+    {
+        return std::less<T>()(left, right);
+    }
+};
+
+template <class T = void>
+struct equal_to
+{
+    using result_type = bool;
+
+    constexpr bool
+    operator()(T const& left, T const& right) const
+    {
+        return std::equal_to<T>()(left, right);
+    }
+};
+
+#else
+
+template <class T = void>
+using less = std::less<T>;
+
+template <class T = void>
+using equal_to = std::equal_to<T>;
+
+#endif
+
+}  // namespace xrpl

include/xrpl/basics/contract.h

@@ -15,23 +15,20 @@ namespace xrpl {
     preconditions, postconditions, and invariants.
 */
 
-/**
- * Generates and logs a call stack
- */
+/** Generates and logs a call stack */
 void
 logThrow(std::string const& title);
 
-/**
- * Rethrow the exception currently being handled.
- *
- * When called from within a catch block, it will pass
- * control to the next matching exception handler, if any.
- * Otherwise, std::terminate will be called.
- *
- * ASAN can't handle sudden jumps in control flow very well. This
- * function is marked as XRPL_NO_SANITIZE_ADDRESS to prevent it from
- * triggering false positives, since it throws.
- */
+/** Rethrow the exception currently being handled.
+
+    When called from within a catch block, it will pass
+    control to the next matching exception handler, if any.
+    Otherwise, std::terminate will be called.
+
+    ASAN can't handle sudden jumps in control flow very well. This
+    function is marked as XRPL_NO_SANITIZE_ADDRESS to prevent it from
+    triggering false positives, since it throws.
+*/
 [[noreturn]] XRPL_NO_SANITIZE_ADDRESS inline void
 rethrow()
 {
@@ -59,9 +56,7 @@ Throw(Args&&... args)
     throw std::move(e);
 }
 
-/**
- * Called when faulty logic causes a broken invariant.
- */
+/** Called when faulty logic causes a broken invariant. */
 [[noreturn]] void
 logicError(std::string const& how) noexcept;
 

include/xrpl/basics/hardened_hash.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <xrpl/beast/hash/hash_append.h>
 #include <xrpl/beast/hash/xxhasher.h>
 
 #include <cstdint>
@@ -39,33 +40,33 @@ makeSeedPair() noexcept
 
 /**
  * Seed functor once per construction
- *
- * A std compatible hash adapter that resists adversarial inputs.
- * For this to work, T must implement in its own namespace:
- *
- * @code
- *
- * template <class Hasher>
- * void
- * hash_append (Hasher& h, T const& t) noexcept
- * {
- *     // hash_append each base and member that should
- *     //  participate in forming the hash
- *     using beast::hash_append;
- *     hash_append (h, static_cast<T::base1 const&>(t));
- *     hash_append (h, static_cast<T::base2 const&>(t));
- *     // ...
- *     hash_append (h, t.member1);
- *     hash_append (h, t.member2);
- *     // ...
- * }
- *
- * @endcode
- *
- * Do not use any version of Murmur or CityHash for the Hasher
- * template parameter (the hashing algorithm).  For details
- * see https://131002.net/siphash/#at
- */
+
+   A std compatible hash adapter that resists adversarial inputs.
+   For this to work, T must implement in its own namespace:
+
+   @code
+
+   template <class Hasher>
+   void
+   hash_append (Hasher& h, T const& t) noexcept
+   {
+       // hash_append each base and member that should
+       //  participate in forming the hash
+       using beast::hash_append;
+       hash_append (h, static_cast<T::base1 const&>(t));
+       hash_append (h, static_cast<T::base2 const&>(t));
+       // ...
+       hash_append (h, t.member1);
+       hash_append (h, t.member2);
+       // ...
+   }
+
+   @endcode
+
+   Do not use any version of Murmur or CityHash for the Hasher
+   template parameter (the hashing algorithm).  For details
+   see https://131002.net/siphash/#at
+*/
 
 template <class HashAlgorithm = beast::Xxhasher>
 class HardenedHash

include/xrpl/basics/join.h

@@ -1,9 +1,7 @@
 #pragma once
 
-#include <cstddef>
 #include <string>
 #include <string_view>
-#include <utility>
 
 namespace xrpl {
 

include/xrpl/basics/make_SSLContext.h

@@ -2,20 +2,15 @@
 
 #include <boost/asio/ssl/context.hpp>
 
-#include <memory>
 #include <string>
 
 namespace xrpl {
 
-/**
- * Create a self-signed SSL context that allows anonymous Diffie Hellman.
- */
+/** Create a self-signed SSL context that allows anonymous Diffie Hellman. */
 std::shared_ptr<boost::asio::ssl::context>
 makeSslContext(std::string const& cipherList);
 
-/**
- * Create an authenticated SSL context using the specified files.
- */
+/** Create an authenticated SSL context using the specified files. */
 std::shared_ptr<boost::asio::ssl::context>
 makeSslContextAuthed(
     std::string const& keyFile,

include/xrpl/basics/mulDiv.h

@@ -7,16 +7,16 @@
 namespace xrpl {
 constexpr auto kMuldivMax = std::numeric_limits<std::uint64_t>::max();
 
-/**
- * Return value*mul/div accurately.
- *
- * Computes the result of the multiplication and division in
- * a single step, avoiding overflow and retaining precision.
- *
- * @throws None
- * @return `std::nullopt` if the calculation overflows. Otherwise,
- *         `value * mul / div`.
- */
+/** Return value*mul/div accurately.
+    Computes the result of the multiplication and division in
+    a single step, avoiding overflow and retaining precision.
+    Throws:
+        None
+    Returns:
+        `std::optional`:
+            `std::nullopt` if the calculation overflows. Otherwise, `value * mul
+   / div`.
+*/
 std::optional<std::uint64_t>
 mulDiv(std::uint64_t value, std::uint64_t mul, std::uint64_t div);
 

include/xrpl/basics/partitioned_unordered_map.h

@@ -3,10 +3,7 @@
 #include <xrpl/beast/hash/uhash.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
-#include <cstddef>
 #include <functional>
-#include <iterator>
-#include <memory>
 #include <optional>
 #include <string>
 #include <thread>
@@ -138,8 +135,11 @@ public:
         {
         }
 
-        ConstIterator(Iterator const& orig) : map(orig.map), ait(orig.ait), mit(orig.mit)
+        ConstIterator(Iterator const& orig)
         {
+            map = orig.map;
+            ait = orig.ait;
+            mit = orig.mit;
         }
 
         const_reference
@@ -228,11 +228,11 @@ private:
 
 public:
     PartitionedUnorderedMap(std::optional<std::size_t> partitions = std::nullopt)
+    {
         // Set partitions to the number of hardware threads if the parameter
         // is either empty or set to 0.
-        : partitions_(
-              partitions && (*partitions != 0u) ? *partitions : std::thread::hardware_concurrency())
-    {
+        partitions_ =
+            partitions && (*partitions != 0u) ? *partitions : std::thread::hardware_concurrency();
         map_.resize(partitions_);
         XRPL_ASSERT(
             partitions_,

include/xrpl/basics/random.h

@@ -3,6 +3,7 @@
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/beast/xor_shift_engine.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <limits>
 #include <mutex>
@@ -33,17 +34,16 @@ template <class Engine, class Result = typename Engine::result_type>
 using is_engine = std::is_invocable_r<Result, Engine>;
 }  // namespace detail
 
-/**
- * Return the default random engine.
- *
- * This engine is guaranteed to be deterministic, but by
- * default will be randomly seeded. It is NOT cryptographically
- * secure and MUST NOT be used to generate randomness that
- * will be used for keys, secure cookies, IVs, padding, etc.
- *
- * Each thread gets its own instance of the engine which
- * will be randomly seeded.
- */
+/** Return the default random engine.
+
+    This engine is guaranteed to be deterministic, but by
+    default will be randomly seeded. It is NOT cryptographically
+    secure and MUST NOT be used to generate randomness that
+    will be used for keys, secure cookies, IVs, padding, etc.
+
+    Each thread gets its own instance of the engine which
+    will be randomly seeded.
+*/
 inline beast::xor_shift_engine&
 defaultPrng()
 {
@@ -71,31 +71,29 @@ defaultPrng()
     return kEngine;
 }
 
-/**
- * Return a uniformly distributed random integer.
- *
- * @param min The smallest value to return. If not specified
- *            the value defaults to 0.
- * @param max The largest value to return. If not specified
- *            the value defaults to the largest value that
- *            can be represented.
- *
- * The randomness is generated by the specified engine (or
- * the default engine if one is not specified). The result
- * is cryptographically secure only when the engine passed
- * into the function is cryptographically secure.
- *
- * @note The range is always a closed interval, so calling
- *       rand_int(-5, 15) can return any integer in the
- *       closed interval [-5, 15]; similarly, calling
- *       rand_int(7) can return any integer in the closed
- *       interval [0, 7].
- */
+/** Return a uniformly distributed random integer.
+
+    @param min The smallest value to return. If not specified
+               the value defaults to 0.
+    @param max The largest value to return. If not specified
+               the value defaults to the largest value that
+               can be represented.
+
+    The randomness is generated by the specified engine (or
+    the default engine if one is not specified). The result
+    is cryptographically secure only when the engine passed
+    into the function is cryptographically secure.
+
+    @note The range is always a closed interval, so calling
+          rand_int(-5, 15) can return any integer in the
+          closed interval [-5, 15]; similarly, calling
+          rand_int(7) can return any integer in the closed
+          interval [0, 7].
+*/
 /** @{ */
 template <class Engine, class Integral>
-Integral
+std::enable_if_t<std::is_integral_v<Integral> && detail::is_engine<Engine>::value, Integral>
 randInt(Engine& engine, Integral min, Integral max)
-    requires(std::is_integral_v<Integral> && detail::is_engine<Engine>::value)
 {
     XRPL_ASSERT(max > min, "xrpl::randInt : max over min inputs");
 
@@ -106,73 +104,63 @@ randInt(Engine& engine, Integral min, Integral max)
 }
 
 template <class Integral>
-Integral
+std::enable_if_t<std::is_integral_v<Integral>, Integral>
 randInt(Integral min, Integral max)
-    requires(std::is_integral_v<Integral>)
 {
     return randInt(defaultPrng(), min, max);
 }
 
 template <class Engine, class Integral>
-Integral
+std::enable_if_t<std::is_integral_v<Integral> && detail::is_engine<Engine>::value, Integral>
 randInt(Engine& engine, Integral max)
-    requires(std::is_integral_v<Integral> && detail::is_engine<Engine>::value)
 {
     return randInt(engine, Integral(0), max);
 }
 
 template <class Integral>
-Integral
+std::enable_if_t<std::is_integral_v<Integral>, Integral>
 randInt(Integral max)
-    requires(std::is_integral_v<Integral>)
 {
     return randInt(defaultPrng(), max);
 }
 
 template <class Integral, class Engine>
-Integral
+std::enable_if_t<std::is_integral_v<Integral> && detail::is_engine<Engine>::value, Integral>
 randInt(Engine& engine)
-    requires(std::is_integral_v<Integral> && detail::is_engine<Engine>::value)
 {
     return randInt(engine, std::numeric_limits<Integral>::max());
 }
 
 template <class Integral = int>
-Integral
+std::enable_if_t<std::is_integral_v<Integral>, Integral>
 randInt()
-    requires(std::is_integral_v<Integral>)
 {
     return randInt(defaultPrng(), std::numeric_limits<Integral>::max());
 }
 /** @} */
 
-/**
- * Return a random byte
- */
+/** Return a random byte */
 /** @{ */
 template <class Byte, class Engine>
-Byte
+std::enable_if_t<
+    (std::is_same_v<Byte, unsigned char> || std::is_same_v<Byte, std::uint8_t>) &&
+        detail::is_engine<Engine>::value,
+    Byte>
 randByte(Engine& engine)
-    requires(
-        (std::is_same_v<Byte, unsigned char> || std::is_same_v<Byte, std::uint8_t>) &&
-        detail::is_engine<Engine>::value)
 {
     return static_cast<Byte>(randInt<Engine, std::uint32_t>(
         engine, std::numeric_limits<Byte>::min(), std::numeric_limits<Byte>::max()));
 }
 
 template <class Byte = std::uint8_t>
-Byte
+std::enable_if_t<(std::is_same_v<Byte, unsigned char> || std::is_same_v<Byte, std::uint8_t>), Byte>
 randByte()
-    requires(std::is_same_v<Byte, unsigned char> || std::is_same_v<Byte, std::uint8_t>)
 {
     return randByte<Byte>(defaultPrng());
 }
 /** @} */
 
-/**
- * Return a random boolean value
- */
+/** Return a random boolean value */
 /** @{ */
 template <class Engine>
 inline bool

include/xrpl/basics/safe_cast.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <xrpl/beast/utility/instrumentation.h>  // IWYU pragma: keep
+#include <xrpl/beast/utility/instrumentation.h>
 
 #include <type_traits>
 
@@ -17,9 +17,8 @@ concept SafeToCast = (std::is_integral_v<Src> && std::is_integral_v<Dest>) &&
                                                      : sizeof(Dest) >= sizeof(Src));
 
 template <class Dest, class Src>
-constexpr Dest
+constexpr std::enable_if_t<std::is_integral_v<Dest> && std::is_integral_v<Src>, Dest>
 safeCast(Src s) noexcept
-    requires(std::is_integral_v<Dest> && std::is_integral_v<Src>)
 {
     static_assert(
         std::is_signed_v<Dest> || std::is_unsigned_v<Src>, "Cannot cast signed to unsigned");
@@ -31,17 +30,15 @@ safeCast(Src s) noexcept
 }
 
 template <class Dest, class Src>
-constexpr Dest
+constexpr std::enable_if_t<std::is_enum_v<Dest> && std::is_integral_v<Src>, Dest>
 safeCast(Src s) noexcept
-    requires(std::is_enum_v<Dest> && std::is_integral_v<Src>)
 {
     return static_cast<Dest>(safeCast<std::underlying_type_t<Dest>>(s));
 }
 
 template <class Dest, class Src>
-constexpr Dest
+constexpr std::enable_if_t<std::is_integral_v<Dest> && std::is_enum_v<Src>, Dest>
 safeCast(Src s) noexcept
-    requires(std::is_integral_v<Dest> && std::is_enum_v<Src>)
 {
     return safeCast<Dest>(static_cast<std::underlying_type_t<Src>>(s));
 }
@@ -51,9 +48,8 @@ safeCast(Src s) noexcept
 // underlying types become safe, it can be converted to a safe_cast.
 
 template <class Dest, class Src>
-constexpr Dest
+constexpr std::enable_if_t<std::is_integral_v<Dest> && std::is_integral_v<Src>, Dest>
 unsafeCast(Src s) noexcept
-    requires(std::is_integral_v<Dest> && std::is_integral_v<Src>)
 {
     static_assert(
         !SafeToCast<Src, Dest>,
@@ -63,17 +59,15 @@ unsafeCast(Src s) noexcept
 }
 
 template <class Dest, class Src>
-constexpr Dest
+constexpr std::enable_if_t<std::is_enum_v<Dest> && std::is_integral_v<Src>, Dest>
 unsafeCast(Src s) noexcept
-    requires(std::is_enum_v<Dest> && std::is_integral_v<Src>)
 {
     return static_cast<Dest>(unsafeCast<std::underlying_type_t<Dest>>(s));
 }
 
 template <class Dest, class Src>
-constexpr Dest
+constexpr std::enable_if_t<std::is_integral_v<Dest> && std::is_enum_v<Src>, Dest>
 unsafeCast(Src s) noexcept
-    requires(std::is_integral_v<Dest> && std::is_enum_v<Src>)
 {
     return unsafeCast<Dest>(static_cast<std::underlying_type_t<Src>>(s));
 }

include/xrpl/basics/scope.h

@@ -46,9 +46,11 @@ public:
     operator=(ScopeExit&&) = delete;
 
     template <class EFP>
-    explicit ScopeExit(EFP&& f) noexcept
-        requires(
-            !std::is_same_v<std::remove_cv_t<EFP>, ScopeExit> && std::is_constructible_v<EF, EFP>)
+    explicit ScopeExit(
+        EFP&& f,
+        std::enable_if_t<
+            !std::is_same_v<std::remove_cv_t<EFP>, ScopeExit> &&
+            std::is_constructible_v<EF, EFP>>* = 0) noexcept
         : exitFunction_{std::forward<EFP>(f)}
     {
         static_assert(std::is_nothrow_constructible_v<EF, decltype(std::forward<EFP>(f))>);
@@ -91,9 +93,11 @@ public:
     operator=(ScopeFail&&) = delete;
 
     template <class EFP>
-    explicit ScopeFail(EFP&& f) noexcept
-        requires(
-            !std::is_same_v<std::remove_cv_t<EFP>, ScopeFail> && std::is_constructible_v<EF, EFP>)
+    explicit ScopeFail(
+        EFP&& f,
+        std::enable_if_t<
+            !std::is_same_v<std::remove_cv_t<EFP>, ScopeFail> &&
+            std::is_constructible_v<EF, EFP>>* = 0) noexcept
         : exitFunction_{std::forward<EFP>(f)}
     {
         static_assert(std::is_nothrow_constructible_v<EF, decltype(std::forward<EFP>(f))>);
@@ -136,11 +140,12 @@ public:
     operator=(ScopeSuccess&&) = delete;
 
     template <class EFP>
-    explicit ScopeSuccess(EFP&& f) noexcept(
-        std::is_nothrow_constructible_v<EF, EFP> || std::is_nothrow_constructible_v<EF, EFP&>)
-        requires(
+    explicit ScopeSuccess(
+        EFP&& f,
+        std::enable_if_t<
             !std::is_same_v<std::remove_cv_t<EFP>, ScopeSuccess> &&
-            std::is_constructible_v<EF, EFP>)
+            std::is_constructible_v<EF, EFP>>* =
+            0) noexcept(std::is_nothrow_constructible_v<EF, EFP> || std::is_nothrow_constructible_v<EF, EFP&>)
         : exitFunction_{std::forward<EFP>(f)}
     {
     }
@@ -156,41 +161,41 @@ template <class EF>
 ScopeSuccess(EF) -> ScopeSuccess<EF>;
 
 /**
- * Automatically unlocks and re-locks a unique_lock object.
- *
- * This is the reverse of a std::unique_lock object - instead of locking the
- * mutex for the lifetime of this object, it unlocks it.
- *
- * Make sure you don't try to unlock mutexes that aren't actually locked!
- *
- * This is essentially a less-versatile boost::reverse_lock.
- *
- * e.g. @code
- *
- * std::mutex mut;
- *
- * for (;;)
- * {
- *     std::unique_lock myScopedLock{mut};
- *     // mut is now locked
- *
- *     ... do some stuff with it locked ..
- *
- *     while (xyz)
- *     {
- *         ... do some stuff with it locked ..
- *
- *         scope_unlock unlocker{myScopedLock};
- *
- *         // mut is now unlocked for the remainder of this block,
- *         // and re-locked at the end.
- *
- *         ...do some stuff with it unlocked ...
- *     }  // mut gets locked here.
- *
- * }  // mut gets unlocked here
- * @endcode
- */
+    Automatically unlocks and re-locks a unique_lock object.
+
+    This is the reverse of a std::unique_lock object - instead of locking the
+   mutex for the lifetime of this object, it unlocks it.
+
+    Make sure you don't try to unlock mutexes that aren't actually locked!
+
+    This is essentially a less-versatile boost::reverse_lock.
+
+    e.g. @code
+
+    std::mutex mut;
+
+    for (;;)
+    {
+        std::unique_lock myScopedLock{mut};
+        // mut is now locked
+
+        ... do some stuff with it locked ..
+
+        while (xyz)
+        {
+            ... do some stuff with it locked ..
+
+            scope_unlock unlocker{myScopedLock};
+
+            // mut is now unlocked for the remainder of this block,
+            // and re-locked at the end.
+
+            ...do some stuff with it unlocked ...
+        }  // mut gets locked here.
+
+    }  // mut gets unlocked here
+    @endcode
+*/
 
 template <class Mutex>
 class ScopeUnlock

include/xrpl/basics/spinlock.h

@@ -15,16 +15,15 @@
 namespace xrpl {
 
 namespace detail {
-/**
- * Inform the processor that we are in a tight spin-wait loop.
- *
- * Spinlocks caught in tight loops can result in the processor's pipeline
- * filling up with comparison operations, resulting in a misprediction at
- * the time the lock is finally acquired, necessitating pipeline flushing
- * which is ridiculously expensive and results in very high latency.
- *
- * This function instructs the processor to "pause" for some architecture
- * specific amount of time, to prevent this.
+/** Inform the processor that we are in a tight spin-wait loop.
+
+    Spinlocks caught in tight loops can result in the processor's pipeline
+    filling up with comparison operations, resulting in a misprediction at
+    the time the lock is finally acquired, necessitating pipeline flushing
+    which is ridiculously expensive and results in very high latency.
+
+    This function instructs the processor to "pause" for some architecture
+    specific amount of time, to prevent this.
  */
 inline void
 spinPause() noexcept
@@ -39,39 +38,37 @@ spinPause() noexcept
 }  // namespace detail
 
 /** @{ */
-/**
- * Classes to handle arrays of spinlocks packed into a single atomic integer:
- *
- * Packed spinlocks allow for tremendously space-efficient lock-sharding
- * but they come at a cost.
- *
- * First, the implementation is necessarily low-level and uses advanced
- * features like memory ordering and highly platform-specific tricks to
- * maximize performance. This imposes a significant and ongoing cost to
- * developers.
- *
- * Second, and perhaps most important, is that the packing of multiple
- * locks into a single integer which, albeit space-efficient, also has
- * performance implications stemming from data dependencies, increased
- * cache-coherency traffic between processors and heavier loads on the
- * processor's load/store units.
- *
- * To be sure, these locks can have advantages but they are definitely
- * not general purpose locks and should not be thought of or used that
- * way. The use cases for them are likely few and far between; without
- * a compelling reason to use them, backed by profiling data, it might
- * be best to use one of the standard locking primitives instead. Note
- * that in most common platforms, `std::mutex` is so heavily optimized
- * that it can, usually, outperform spinlocks.
- *
- * @tparam T An unsigned integral type (e.g. std::uint16_t)
+/** Classes to handle arrays of spinlocks packed into a single atomic integer:
+
+    Packed spinlocks allow for tremendously space-efficient lock-sharding
+    but they come at a cost.
+
+    First, the implementation is necessarily low-level and uses advanced
+    features like memory ordering and highly platform-specific tricks to
+    maximize performance. This imposes a significant and ongoing cost to
+    developers.
+
+    Second, and perhaps most important, is that the packing of multiple
+    locks into a single integer which, albeit space-efficient, also has
+    performance implications stemming from data dependencies, increased
+    cache-coherency traffic between processors and heavier loads on the
+    processor's load/store units.
+
+    To be sure, these locks can have advantages but they are definitely
+    not general purpose locks and should not be thought of or used that
+    way. The use cases for them are likely few and far between; without
+    a compelling reason to use them, backed by profiling data, it might
+    be best to use one of the standard locking primitives instead. Note
+    that in most common platforms, `std::mutex` is so heavily optimized
+    that it can, usually, outperform spinlocks.
+
+    @tparam T An unsigned integral type (e.g. std::uint16_t)
  */
 
-/**
- * A class that grabs a single packed spinlock from an atomic integer.
- *
- * This class meets the requirements of Lockable:
- *     https://en.cppreference.com/w/cpp/named_req/Lockable
+/** A class that grabs a single packed spinlock from an atomic integer.
+
+    This class meets the requirements of Lockable:
+        https://en.cppreference.com/w/cpp/named_req/Lockable
  */
 template <class T>
 class PackedSpinlock
@@ -94,14 +91,13 @@ public:
     PackedSpinlock&
     operator=(PackedSpinlock const&) = delete;
 
-    /**
-     * A single spinlock packed inside the specified atomic
-     *
-     * @param lock The atomic integer inside which the spinlock is packed.
-     * @param index The index of the spinlock this object acquires.
-     *
-     * @note For performance reasons, you should strive to have `lock` be
-     *       on a cacheline by itself.
+    /** A single spinlock packed inside the specified atomic
+
+        @param lock The atomic integer inside which the spinlock is packed.
+        @param index The index of the spinlock this object acquires.
+
+        @note For performance reasons, you should strive to have `lock` be
+              on a cacheline by itself.
      */
     PackedSpinlock(std::atomic<T>& lock, int index) : bits_(lock), mask_(static_cast<T>(1) << index)
     {
@@ -137,18 +133,17 @@ public:
     }
 };
 
-/**
- * A spinlock implemented on top of an atomic integer.
- *
- * @note Using `packed_spinlock` and `spinlock` against the same underlying
- *       atomic integer can result in `spinlock` not being able to actually
- *       acquire the lock during periods of high contention, because of how
- *       the two locks operate: `spinlock` will spin trying to grab all the
- *       bits at once, whereas any given `packed_spinlock` will only try to
- *       grab one bit at a time. Caveat emptor.
- *
- * This class meets the requirements of Lockable:
- *     https://en.cppreference.com/w/cpp/named_req/Lockable
+/** A spinlock implemented on top of an atomic integer.
+
+    @note Using `packed_spinlock` and `spinlock` against the same underlying
+          atomic integer can result in `spinlock` not being able to actually
+          acquire the lock during periods of high contention, because of how
+          the two locks operate: `spinlock` will spin trying to grab all the
+          bits at once, whereas any given `packed_spinlock` will only try to
+          grab one bit at a time. Caveat emptor.
+
+    This class meets the requirements of Lockable:
+        https://en.cppreference.com/w/cpp/named_req/Lockable
  */
 template <class T>
 class Spinlock
@@ -164,13 +159,12 @@ public:
     Spinlock&
     operator=(Spinlock const&) = delete;
 
-    /**
-     * Grabs the
-     *
-     * @param lock The atomic integer to spin against.
-     *
-     * @note For performance reasons, you should strive to have `lock` be
-     *       on a cacheline by itself.
+    /** Grabs the
+
+        @param lock The atomic integer to spin against.
+
+        @note For performance reasons, you should strive to have `lock` be
+              on a cacheline by itself.
      */
     Spinlock(std::atomic<T>& lock) : lock_(lock)
     {

include/xrpl/basics/strHex.h

@@ -3,9 +3,6 @@
 #include <boost/algorithm/hex.hpp>
 #include <boost/endian/conversion.hpp>
 
-#include <iterator>
-#include <string>
-
 namespace xrpl {
 
 template <class FwdIt>

include/xrpl/basics/tagged_integer.h

@@ -7,23 +7,21 @@
 #include <boost/operators.hpp>
 
 #include <iostream>
-#include <string>
 #include <type_traits>
 
 namespace xrpl {
 
-/**
- * A type-safe wrap around standard integral types
- *
- * The tag is used to implement type safety, catching mismatched types at
- * compile time. Multiple instantiations wrapping the same underlying integral
- * type are distinct types (distinguished by tag) and will not interoperate. A
- * tagged_integer supports all the usual assignment, arithmetic, comparison and
- * shifting operations defined for the underlying type
- *
- * The tag is not meant as a unit, which would require restricting the set of
- * allowed arithmetic operations.
- */
+/** A type-safe wrap around standard integral types
+
+    The tag is used to implement type safety, catching mismatched types at
+    compile time. Multiple instantiations wrapping the same underlying integral
+    type are distinct types (distinguished by tag) and will not interoperate. A
+    tagged_integer supports all the usual assignment, arithmetic, comparison and
+    shifting operations defined for the underlying type
+
+    The tag is not meant as a unit, which would require restricting the set of
+    allowed arithmetic operations.
+*/
 template <class Int, class Tag>
 class TaggedInteger : boost::totally_ordered<
                           TaggedInteger<Int, Tag>,
@@ -44,10 +42,10 @@ public:
 
     TaggedInteger() = default;
 
-    template <class OtherInt>
-    explicit constexpr TaggedInteger(OtherInt value) noexcept
-        requires(std::is_integral_v<OtherInt> && sizeof(OtherInt) <= sizeof(Int))
-        : value_(value)
+    template <
+        class OtherInt,
+        class = std::enable_if_t<std::is_integral_v<OtherInt> && sizeof(OtherInt) <= sizeof(Int)>>
+    explicit constexpr TaggedInteger(OtherInt value) noexcept : value_(value)
     {
         static_assert(sizeof(TaggedInteger) == sizeof(Int), "tagged_integer is adding padding");
     }

include/xrpl/beast/asio/io_latency_probe.h

@@ -8,15 +8,12 @@
 
 #include <chrono>
 #include <condition_variable>
-#include <cstddef>
 #include <mutex>
 #include <stdexcept>
 
 namespace beast {
 
-/**
- * Measures handler latency on an io_context queue.
- */
+/** Measures handler latency on an io_context queue. */
 template <class Clock>
 class IOLatencyProbe
 {
@@ -44,9 +41,7 @@ public:
         cancel(lock, true);
     }
 
-    /**
-     * Return the io_context associated with the latency probe.
-     */
+    /** Return the io_context associated with the latency probe. */
     /** @{ */
     boost::asio::io_context&
     getIoContext()
@@ -61,10 +56,9 @@ public:
     }
     /** @} */
 
-    /**
-     * Cancel all pending i/o.
-     * Any handlers which have already been queued will still be called.
-     */
+    /** Cancel all pending i/o.
+        Any handlers which have already been queued will still be called.
+    */
     /** @{ */
     void
     cancel()
@@ -81,11 +75,10 @@ public:
     }
     /** @} */
 
-    /**
-     * Measure one sample of i/o latency.
-     * Handler will be called with this signature:
-     *     void Handler (Duration d);
-     */
+    /** Measure one sample of i/o latency.
+        Handler will be called with this signature:
+            void Handler (Duration d);
+    */
     template <class Handler>
     void
     sampleOne(Handler&& handler)
@@ -97,11 +90,10 @@ public:
             ios_, SampleOp<Handler>(std::forward<Handler>(handler), Clock::now(), false, this));
     }
 
-    /**
-     * Initiate continuous i/o latency sampling.
-     * Handler will be called with this signature:
-     *     void Handler (std::chrono::milliseconds);
-     */
+    /** Initiate continuous i/o latency sampling.
+        Handler will be called with this signature:
+            void Handler (std::chrono::milliseconds);
+    */
     template <class Handler>
     void
     sample(Handler&& handler)

include/xrpl/beast/clock/abstract_clock.h

@@ -2,35 +2,34 @@
 
 namespace beast {
 
-/**
- * Abstract interface to a clock.
- *
- * This makes now() a member function instead of a static member, so
- * an instance of the class can be dependency injected, facilitating
- * unit tests where time may be controlled.
- *
- * An abstract_clock inherits all the nested types of the Clock
- * template parameter.
- *
- * Example:
- *
- * @code
- *
- * struct Implementation
- * {
- *     using clock_type = abstract_clock <std::chrono::steady_clock>;
- *     clock_type& clock_;
- *     explicit Implementation (clock_type& clock)
- *         : clock_(clock)
- *     {
- *     }
- * };
- *
- * @endcode
- *
- * @tparam Clock A type meeting these requirements:
- *     http://en.cppreference.com/w/cpp/concept/Clock
- */
+/** Abstract interface to a clock.
+
+    This makes now() a member function instead of a static member, so
+    an instance of the class can be dependency injected, facilitating
+    unit tests where time may be controlled.
+
+    An abstract_clock inherits all the nested types of the Clock
+    template parameter.
+
+    Example:
+
+    @code
+
+    struct Implementation
+    {
+        using clock_type = abstract_clock <std::chrono::steady_clock>;
+        clock_type& clock_;
+        explicit Implementation (clock_type& clock)
+            : clock_(clock)
+        {
+        }
+    };
+
+    @endcode
+
+    @tparam Clock A type meeting these requirements:
+        http://en.cppreference.com/w/cpp/concept/Clock
+*/
 template <class Clock>
 class AbstractClock
 {
@@ -47,9 +46,7 @@ public:
     AbstractClock() = default;
     AbstractClock(AbstractClock const&) = default;
 
-    /**
-     * Returns the current time.
-     */
+    /** Returns the current time. */
     [[nodiscard]] virtual time_point
     now() const = 0;
 };
@@ -77,12 +74,11 @@ struct AbstractClockWrapper : public AbstractClock<Facade>
 
 //------------------------------------------------------------------------------
 
-/**
- * Returns a global instance of an abstract clock.
- * @tparam Facade A type meeting these requirements:
- *     http://en.cppreference.com/w/cpp/concept/Clock
- * @tparam Clock The actual concrete clock to use.
- */
+/** Returns a global instance of an abstract clock.
+    @tparam Facade A type meeting these requirements:
+        http://en.cppreference.com/w/cpp/concept/Clock
+    @tparam Clock The actual concrete clock to use.
+*/
 template <class Facade, class Clock = Facade>
 AbstractClock<Facade>&
 getAbstractClock()

include/xrpl/beast/clock/basic_seconds_clock.h

@@ -4,16 +4,15 @@
 
 namespace beast {
 
-/**
- * A clock whose minimum resolution is one second.
- *
- * The purpose of this class is to optimize the performance of the now()
- * member function call. It uses a dedicated thread that wakes up at least
- * once per second to sample the requested trivial clock.
- *
- * @tparam Clock A type meeting these requirements:
- *     http://en.cppreference.com/w/cpp/concept/Clock
- */
+/** A clock whose minimum resolution is one second.
+
+    The purpose of this class is to optimize the performance of the now()
+    member function call. It uses a dedicated thread that wakes up at least
+    once per second to sample the requested trivial clock.
+
+    @tparam Clock A type meeting these requirements:
+        http://en.cppreference.com/w/cpp/concept/Clock
+*/
 class BasicSecondsClock
 {
 public:

include/xrpl/beast/clock/manual_clock.h

@@ -7,16 +7,15 @@
 
 namespace beast {
 
-/**
- * Manual clock implementation.
- *
- * This concrete class implements the @ref abstract_clock interface and
- * allows the time to be advanced manually, mainly for the purpose of
- * providing a clock in unit tests.
- *
- * @tparam Clock A type meeting these requirements:
- *     http://en.cppreference.com/w/cpp/concept/Clock
- */
+/** Manual clock implementation.
+
+    This concrete class implements the @ref abstract_clock interface and
+    allows the time to be advanced manually, mainly for the purpose of
+    providing a clock in unit tests.
+
+    @tparam Clock A type meeting these requirements:
+        http://en.cppreference.com/w/cpp/concept/Clock
+*/
 template <class Clock>
 class ManualClock : public AbstractClock<Clock>
 {
@@ -39,9 +38,7 @@ public:
         return now_;
     }
 
-    /**
-     * Set the current time of the manual clock.
-     */
+    /** Set the current time of the manual clock. */
     void
     set(time_point const& when)
     {
@@ -51,9 +48,7 @@ public:
         now_ = when;
     }
 
-    /**
-     * Convenience for setting the time in seconds from epoch.
-     */
+    /** Convenience for setting the time in seconds from epoch. */
     template <class Integer>
     void
     set(Integer secondsFromEpoch)
@@ -61,9 +56,7 @@ public:
         set(time_point(duration(std::chrono::seconds(secondsFromEpoch))));
     }
 
-    /**
-     * Advance the clock by a duration.
-     */
+    /** Advance the clock by a duration. */
     template <class Rep, class Period>
     void
     advance(std::chrono::duration<Rep, Period> const& elapsed)
@@ -74,9 +67,7 @@ public:
         now_ += elapsed;
     }
 
-    /**
-     * Convenience for advancing the clock by one second.
-     */
+    /** Convenience for advancing the clock by one second. */
     ManualClock&
     operator++()
     {

include/xrpl/beast/container/aged_container_utility.h

@@ -3,17 +3,14 @@
 #include <xrpl/beast/container/aged_container.h>
 
 #include <chrono>
-#include <cstddef>
+#include <type_traits>
 
 namespace beast {
 
-/**
- * Expire aged container items past the specified age.
- */
+/** Expire aged container items past the specified age. */
 template <class AgedContainer, class Rep, class Period>
-std::size_t
+std::enable_if_t<IsAgedContainer<AgedContainer>::value, std::size_t>
 expire(AgedContainer& c, std::chrono::duration<Rep, Period> const& age)
-    requires(IsAgedContainer<AgedContainer>::value)
 {
     std::size_t n(0);
     auto const expired(c.clock().now() - age);

include/xrpl/beast/container/aged_map.h

@@ -5,7 +5,6 @@
 #include <chrono>
 #include <functional>
 #include <memory>
-#include <utility>
 
 namespace beast {
 

include/xrpl/beast/container/aged_multimap.h

@@ -5,7 +5,6 @@
 #include <chrono>
 #include <functional>
 #include <memory>
-#include <utility>
 
 namespace beast {
 

include/xrpl/beast/container/aged_unordered_map.h

@@ -5,7 +5,6 @@
 #include <chrono>
 #include <functional>
 #include <memory>
-#include <utility>
 
 namespace beast {
 

include/xrpl/beast/container/aged_unordered_multimap.h

@@ -5,7 +5,6 @@
 #include <chrono>
 #include <functional>
 #include <memory>
-#include <utility>
 
 namespace beast {
 

include/xrpl/beast/container/detail/aged_container_iterator.h

@@ -30,19 +30,20 @@ public:
 
     // Disable constructing a const_iterator from a non-const_iterator.
     // Converting between reverse and non-reverse iterators should be explicit.
-    template <bool OtherIsConst, class OtherIterator>
-    explicit AgedContainerIterator(AgedContainerIterator<OtherIsConst, OtherIterator> const& other)
-        requires(
+    template <
+        bool OtherIsConst,
+        class OtherIterator,
+        class = std::enable_if_t<
             (!OtherIsConst || IsConst) &&
-            !static_cast<bool>(std::is_same_v<Iterator, OtherIterator>))
+            !static_cast<bool>(std::is_same_v<Iterator, OtherIterator>)>>
+    explicit AgedContainerIterator(AgedContainerIterator<OtherIsConst, OtherIterator> const& other)
         : iter_(other.iter_)
     {
     }
 
     // Disable constructing a const_iterator from a non-const_iterator.
-    template <bool OtherIsConst>
+    template <bool OtherIsConst, class = std::enable_if_t<!OtherIsConst || IsConst>>
     AgedContainerIterator(AgedContainerIterator<OtherIsConst, Iterator> const& other)
-        requires(!OtherIsConst || IsConst)
         : iter_(other.iter_)
     {
     }
@@ -51,8 +52,7 @@ public:
     template <bool OtherIsConst, class OtherIterator>
     auto
     operator=(AgedContainerIterator<OtherIsConst, OtherIterator> const& other)
-        -> AgedContainerIterator&
-        requires(!OtherIsConst || IsConst)
+        -> std::enable_if_t<!OtherIsConst || IsConst, AgedContainerIterator&>
     {
         iter_ = other.iter_;
         return *this;

include/xrpl/beast/container/detail/aged_ordered_container.h

@@ -11,14 +11,9 @@
 #include <boost/version.hpp>
 
 #include <algorithm>
-#include <chrono>
-#include <cstddef>
-#include <cstdint>
 #include <functional>
 #include <initializer_list>
 #include <memory>
-#include <stdexcept>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 
@@ -39,23 +34,22 @@ struct IsBoostReverseIterator<boost::intrusive::reverse_iterator<It>> : std::tru
     explicit IsBoostReverseIterator() = default;
 };
 
-/**
- * Associative container where each element is also indexed by time.
- *
- * This container mirrors the interface of the standard library ordered
- * associative containers, with the addition that each element is associated
- * with a `when` `time_point` which is obtained from the value of the clock's
- * `now`. The function `touch` updates the time for an element to the current
- * time as reported by the clock.
- *
- * An extra set of iterator types and member functions are provided in the
- * `chronological` memberspace that allow traversal in temporal or reverse
- * temporal order. This container is useful as a building block for caches
- * whose items expire after a certain amount of time. The chronological
- * iterators allow for fully customizable expiration strategies.
- *
- * @see aged_set, aged_multiset, aged_map, aged_multimap
- */
+/** Associative container where each element is also indexed by time.
+
+    This container mirrors the interface of the standard library ordered
+    associative containers, with the addition that each element is associated
+    with a `when` `time_point` which is obtained from the value of the clock's
+    `now`. The function `touch` updates the time for an element to the current
+    time as reported by the clock.
+
+    An extra set of iterator types and member functions are provided in the
+    `chronological` memberspace that allow traversal in temporal or reverse
+    temporal order. This container is useful as a building block for caches
+    whose items expire after a certain amount of time. The chronological
+    iterators allow for fully customizable expiration strategies.
+
+    @see aged_set, aged_multiset, aged_map, aged_multimap
+*/
 template <
     bool IsMulti,
     bool IsMap,
@@ -112,9 +106,10 @@ private:
         {
         }
 
-        template <class... Args>
+        template <
+            class... Args,
+            class = std::enable_if_t<std::is_constructible_v<value_type, Args...>>>
         Element(time_point const& when, Args&&... args)
-            requires(std::is_constructible_v<value_type, Args...>)
             : value(std::forward<Args>(args)...), when(when)
         {
         }
@@ -360,7 +355,6 @@ private:
     deleteElement(Element const* p)
     {
         ElementAllocatorTraits::destroy(config_.alloc(), p);
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast)
         ElementAllocatorTraits::deallocate(config_.alloc(), const_cast<Element*>(p), 1);
     }
 
@@ -609,25 +603,35 @@ public:
     //
     //--------------------------------------------------------------------------
 
-    template <class K, bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
+    template <
+        class K,
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
-    at(K const& k)
-        requires(MaybeMap && !MaybeMulti);
+    at(K const& k);
 
-    template <class K, bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
+    template <
+        class K,
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional<IsMap, T, void*>::type const&
-    at(K const& k) const
-        requires(MaybeMap && !MaybeMulti);
+    at(K const& k) const;
 
-    template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
+    template <
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
-    operator[](Key const& key)
-        requires(MaybeMap && !MaybeMulti);
+    operator[](Key const& key);
 
-    template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
+    template <
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
-    operator[](Key&& key)
-        requires(MaybeMap && !MaybeMulti);
+    operator[](Key&& key);
 
     //--------------------------------------------------------------------------
     //
@@ -761,40 +765,35 @@ public:
     // map, set
     template <bool MaybeMulti = IsMulti>
     auto
-    insert(value_type const& value) -> std::pair<iterator, bool>
-        requires(!MaybeMulti);
+    insert(value_type const& value) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multimap, multiset
     template <bool MaybeMulti = IsMulti>
     auto
-    insert(value_type const& value) -> iterator
-        requires MaybeMulti;
+    insert(value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>;
 
     // set
     template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
     auto
-    insert(value_type&& value) -> std::pair<iterator, bool>
-        requires(!MaybeMulti && !MaybeMap);
+    insert(value_type&& value)
+        -> std::enable_if_t<!MaybeMulti && !MaybeMap, std::pair<iterator, bool>>;
 
     // multiset
     template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
     auto
-    insert(value_type&& value) -> iterator
-        requires(MaybeMulti && !MaybeMap);
+    insert(value_type&& value) -> std::enable_if_t<MaybeMulti && !MaybeMap, iterator>;
 
     //---
 
     // map, set
     template <bool MaybeMulti = IsMulti>
     auto
-    insert(const_iterator hint, value_type const& value) -> iterator
-        requires(!MaybeMulti);
+    insert(const_iterator hint, value_type const& value) -> std::enable_if_t<!MaybeMulti, iterator>;
 
     // multimap, multiset
     template <bool MaybeMulti = IsMulti>
-    iterator
+    std::enable_if_t<MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type const& value)
-        requires MaybeMulti
     {
         // VFALCO TODO Figure out how to utilize 'hint'
         return insert(value);
@@ -803,14 +802,12 @@ public:
     // map, set
     template <bool MaybeMulti = IsMulti>
     auto
-    insert(const_iterator hint, value_type&& value) -> iterator
-        requires(!MaybeMulti);
+    insert(const_iterator hint, value_type&& value) -> std::enable_if_t<!MaybeMulti, iterator>;
 
     // multimap, multiset
     template <bool MaybeMulti = IsMulti>
-    iterator
+    std::enable_if_t<MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type&& value)
-        requires MaybeMulti
     {
         // VFALCO TODO Figure out how to utilize 'hint'
         return insert(std::move(value));
@@ -818,18 +815,20 @@ public:
 
     // map, multimap
     template <class P, bool MaybeMap = IsMap>
-    std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>
+    std::enable_if_t<
+        MaybeMap && std::is_constructible_v<value_type, P&&>,
+        std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>>
     insert(P&& value)
-        requires(MaybeMap && std::is_constructible_v<value_type, P &&>)
     {
         return emplace(std::forward<P>(value));
     }
 
     // map, multimap
     template <class P, bool MaybeMap = IsMap>
-    std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>
+    std::enable_if_t<
+        MaybeMap && std::is_constructible_v<value_type, P&&>,
+        std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>>
     insert(const_iterator hint, P&& value)
-        requires(MaybeMap && std::is_constructible_v<value_type, P &&>)
     {
         return emplaceHint(hint, std::forward<P>(value));
     }
@@ -851,45 +850,46 @@ public:
     // map, set
     template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplace(Args&&... args) -> std::pair<iterator, bool>
-        requires(!MaybeMulti);
+    emplace(Args&&... args) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multiset, multimap
     template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplace(Args&&... args) -> iterator
-        requires MaybeMulti;
+    emplace(Args&&... args) -> std::enable_if_t<MaybeMulti, iterator>;
 
     // map, set
     template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplaceHint(const_iterator hint, Args&&... args) -> std::pair<iterator, bool>
-        requires(!MaybeMulti);
+    emplaceHint(const_iterator hint, Args&&... args)
+        -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multiset, multimap
     template <bool MaybeMulti = IsMulti, class... Args>
-    iterator
+    std::enable_if_t<MaybeMulti, iterator>
     emplaceHint(const_iterator /*hint*/, Args&&... args)
-        requires MaybeMulti
     {
         // VFALCO TODO Figure out how to utilize 'hint'
         return emplace<MaybeMulti>(std::forward<Args>(args)...);
     }
 
-    // The constraint prevents erase (reverse_iterator pos) from compiling
-    template <bool IsConst, class Iterator>
+    // enable_if prevents erase (reverse_iterator pos) from compiling
+    template <
+        bool IsConst,
+        class Iterator,
+        class = std::enable_if_t<!IsBoostReverseIterator<Iterator>::value>>
     beast::detail::AgedContainerIterator<false, Iterator>
-    erase(beast::detail::AgedContainerIterator<IsConst, Iterator> pos)
-        requires(!IsBoostReverseIterator<Iterator>::value);
+    erase(beast::detail::AgedContainerIterator<IsConst, Iterator> pos);
 
-    // The constraint prevents erase (reverse_iterator first, reverse_iterator last)
+    // enable_if prevents erase (reverse_iterator first, reverse_iterator last)
     // from compiling
-    template <bool IsConst, class Iterator>
+    template <
+        bool IsConst,
+        class Iterator,
+        class = std::enable_if_t<!IsBoostReverseIterator<Iterator>::value>>
     beast::detail::AgedContainerIterator<false, Iterator>
     erase(
         beast::detail::AgedContainerIterator<IsConst, Iterator> first,
-        beast::detail::AgedContainerIterator<IsConst, Iterator> last)
-        requires(!IsBoostReverseIterator<Iterator>::value);
+        beast::detail::AgedContainerIterator<IsConst, Iterator> last);
 
     template <class K>
     auto
@@ -900,11 +900,13 @@ public:
 
     //--------------------------------------------------------------------------
 
-    // The constraint prevents touch (reverse_iterator pos) from compiling
-    template <bool IsConst, class Iterator>
+    // enable_if prevents touch (reverse_iterator pos) from compiling
+    template <
+        bool IsConst,
+        class Iterator,
+        class = std::enable_if_t<!IsBoostReverseIterator<Iterator>::value>>
     void
     touch(beast::detail::AgedContainerIterator<IsConst, Iterator> pos)
-        requires(!IsBoostReverseIterator<Iterator>::value)
     {
         touch(pos, clock().now());
     }
@@ -1135,25 +1137,25 @@ public:
     }
 
 private:
-    // The constraint prevents erase (reverse_iterator pos, now) from compiling
-    template <bool IsConst, class Iterator>
+    // enable_if prevents erase (reverse_iterator pos, now) from compiling
+    template <
+        bool IsConst,
+        class Iterator,
+        class = std::enable_if_t<!IsBoostReverseIterator<Iterator>::value>>
     void
     touch(
         beast::detail::AgedContainerIterator<IsConst, Iterator> pos,
-        clock_type::time_point const& now)
-        requires(!IsBoostReverseIterator<Iterator>::value);
+        clock_type::time_point const& now);
 
     template <
         bool MaybePropagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
-    void
-    swapData(AgedOrderedContainer& other) noexcept
-        requires MaybePropagate;
+    std::enable_if_t<MaybePropagate>
+    swapData(AgedOrderedContainer& other) noexcept;
 
     template <
         bool MaybePropagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
-    void
-    swapData(AgedOrderedContainer& other) noexcept
-        requires(!MaybePropagate);
+    std::enable_if_t<!MaybePropagate>
+    swapData(AgedOrderedContainer& other) noexcept;
 
 private:
     ConfigT config_;
@@ -1245,7 +1247,12 @@ AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrd
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     AgedOrderedContainer const& other)
-    : config_(other.config_), cont_(other.cont_.get_comp())
+    : config_(other.config_)
+#if BOOST_VERSION >= 108000
+    , cont_(other.cont_.get_comp())
+#else
+    , cont_(other.cont_.comp())
+#endif
 {
     insert(other.cbegin(), other.cend());
 }
@@ -1254,7 +1261,12 @@ template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compa
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     AgedOrderedContainer const& other,
     Allocator const& alloc)
-    : config_(other.config_, alloc), cont_(other.cont_.get_comp())
+    : config_(other.config_, alloc)
+#if BOOST_VERSION >= 108000
+    , cont_(other.cont_.get_comp())
+#else
+    , cont_(other.cont_.comp())
+#endif
 {
     insert(other.cbegin(), other.cend());
 }
@@ -1271,7 +1283,13 @@ template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compa
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     AgedOrderedContainer&& other,  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
     Allocator const& alloc)
-    : config_(std::move(other.config_), alloc), cont_(std::move(other.cont_.get_comp()))
+    : config_(std::move(other.config_), alloc)
+#if BOOST_VERSION >= 108000
+    , cont_(std::move(other.cont_.get_comp()))
+#else
+    , cont_(std::move(other.cont_.comp()))
+#endif
+
 {
     insert(other.cbegin(), other.cend());
     other.clear();
@@ -1362,10 +1380,9 @@ AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operato
 //------------------------------------------------------------------------------
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <class K, bool MaybeMulti, bool MaybeMap>
+template <class K, bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::at(K const& k)
-    requires(MaybeMap && !MaybeMulti)
 {
     auto const iter(cont_.find(k, std::cref(config_.keyCompare())));
     if (iter == cont_.end())
@@ -1374,10 +1391,9 @@ AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::at(K co
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <class K, bool MaybeMulti, bool MaybeMap>
+template <class K, bool MaybeMulti, bool MaybeMap, class>
 std::conditional<IsMap, T, void*>::type const&
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::at(K const& k) const
-    requires(MaybeMap && !MaybeMulti)
 {
     auto const iter(cont_.find(k, std::cref(config_.keyCompare())));
     if (iter == cont_.end())
@@ -1386,10 +1402,9 @@ AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::at(K co
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool MaybeMulti, bool MaybeMap>
+template <bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator[](Key const& key)
-    requires(MaybeMap && !MaybeMulti)
 {
     typename cont_type::insert_commit_data d;
     auto const result(cont_.insert_check(key, std::cref(config_.keyCompare()), d));
@@ -1405,10 +1420,9 @@ AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operato
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool MaybeMulti, bool MaybeMap>
+template <bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator[](Key&& key)
-    requires(MaybeMap && !MaybeMulti)
 {
     typename cont_type::insert_commit_data d;
     auto const result(cont_.insert_check(key, std::cref(config_.keyCompare()), d));
@@ -1442,8 +1456,7 @@ template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compa
 template <bool MaybeMulti>
 auto
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
-    value_type const& value) -> std::pair<iterator, bool>
-    requires(!MaybeMulti)
+    value_type const& value) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     typename cont_type::insert_commit_data d;
     auto const result(cont_.insert_check(extract(value), std::cref(config_.keyCompare()), d));
@@ -1462,8 +1475,7 @@ template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compa
 template <bool MaybeMulti>
 auto
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
-    value_type const& value) -> iterator
-    requires MaybeMulti
+    value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>
 {
     auto const before(cont_.upper_bound(extract(value), std::cref(config_.keyCompare())));
     Element* const p(newElement(value));
@@ -1477,8 +1489,7 @@ template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compa
 template <bool MaybeMulti, bool MaybeMap>
 auto
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(value_type&& value)
-    -> std::pair<iterator, bool>
-    requires(!MaybeMulti && !MaybeMap)
+    -> std::enable_if_t<!MaybeMulti && !MaybeMap, std::pair<iterator, bool>>
 {
     typename cont_type::insert_commit_data d;
     auto const result(cont_.insert_check(extract(value), std::cref(config_.keyCompare()), d));
@@ -1497,8 +1508,7 @@ template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compa
 template <bool MaybeMulti, bool MaybeMap>
 auto
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(value_type&& value)
-    -> iterator
-    requires(MaybeMulti && !MaybeMap)
+    -> std::enable_if_t<MaybeMulti && !MaybeMap, iterator>
 {
     auto const before(cont_.upper_bound(extract(value), std::cref(config_.keyCompare())));
     Element* const p(newElement(std::move(value)));
@@ -1515,8 +1525,7 @@ template <bool MaybeMulti>
 auto
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
     const_iterator hint,
-    value_type const& value) -> iterator
-    requires(!MaybeMulti)
+    value_type const& value) -> std::enable_if_t<!MaybeMulti, iterator>
 {
     typename cont_type::insert_commit_data d;
     auto const result(
@@ -1537,8 +1546,7 @@ template <bool MaybeMulti>
 auto
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
     const_iterator hint,
-    value_type&& value) -> iterator
-    requires(!MaybeMulti)
+    value_type&& value) -> std::enable_if_t<!MaybeMulti, iterator>
 {
     typename cont_type::insert_commit_data d;
     auto const result(
@@ -1558,8 +1566,7 @@ template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compa
 template <bool MaybeMulti, class... Args>
 auto
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::emplace(Args&&... args)
-    -> std::pair<iterator, bool>
-    requires(!MaybeMulti)
+    -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     // VFALCO NOTE Its unfortunate that we need to
     //             construct element here
@@ -1581,8 +1588,7 @@ template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compa
 template <bool MaybeMulti, class... Args>
 auto
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::emplace(Args&&... args)
-    -> iterator
-    requires MaybeMulti
+    -> std::enable_if_t<MaybeMulti, iterator>
 {
     Element* const p(newElement(std::forward<Args>(args)...));
     auto const before(cont_.upper_bound(extract(p->value), std::cref(config_.keyCompare())));
@@ -1597,8 +1603,7 @@ template <bool MaybeMulti, class... Args>
 auto
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::emplaceHint(
     const_iterator hint,
-    Args&&... args) -> std::pair<iterator, bool>
-    requires(!MaybeMulti)
+    Args&&... args) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     // VFALCO NOTE Its unfortunate that we need to
     //             construct element here
@@ -1617,23 +1622,21 @@ AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::emplace
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool IsConst, class Iterator>
+template <bool IsConst, class Iterator, class>
 beast::detail::AgedContainerIterator<false, Iterator>
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::erase(
     beast::detail::AgedContainerIterator<IsConst, Iterator> pos)
-    requires(!IsBoostReverseIterator<Iterator>::value)
 {
     unlinkAndDeleteElement(&*((pos++).iterator()));
     return beast::detail::AgedContainerIterator<false, Iterator>(pos.iterator());
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool IsConst, class Iterator>
+template <bool IsConst, class Iterator, class>
 beast::detail::AgedContainerIterator<false, Iterator>
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::erase(
     beast::detail::AgedContainerIterator<IsConst, Iterator> first,
     beast::detail::AgedContainerIterator<IsConst, Iterator> last)
-    requires(!IsBoostReverseIterator<Iterator>::value)
 {
     for (; first != last;)
         unlinkAndDeleteElement(&*((first++).iterator()));
@@ -1736,12 +1739,11 @@ AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operato
 //------------------------------------------------------------------------------
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool IsConst, class Iterator>
+template <bool IsConst, class Iterator, class>
 void
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::touch(
     beast::detail::AgedContainerIterator<IsConst, Iterator> pos,
     clock_type::time_point const& now)
-    requires(!IsBoostReverseIterator<Iterator>::value)
 {
     auto& e(*pos.iterator());
     e.when = now;
@@ -1751,10 +1753,9 @@ AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::touch(
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 template <bool MaybePropagate>
-void
+std::enable_if_t<MaybePropagate>
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swapData(
     AgedOrderedContainer& other) noexcept
-    requires MaybePropagate
 {
     std::swap(config_.keyCompare(), other.config_.keyCompare());
     std::swap(config_.alloc(), other.config_.alloc());
@@ -1763,10 +1764,9 @@ AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swapDat
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 template <bool MaybePropagate>
-void
+std::enable_if_t<!MaybePropagate>
 AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swapData(
     AgedOrderedContainer& other) noexcept
-    requires(!MaybePropagate)
 {
     std::swap(config_.keyCompare(), other.config_.keyCompare());
     std::swap(config_.clock, other.config_.clock);
@@ -1796,9 +1796,7 @@ swap(
     lhs.swap(rhs);
 }
 
-/**
- * Expire aged container items past the specified age.
- */
+/** Expire aged container items past the specified age. */
 template <
     bool IsMulti,
     bool IsMap,

include/xrpl/beast/container/detail/aged_unordered_container.h

@@ -10,19 +10,13 @@
 #include <boost/intrusive/unordered_set.hpp>
 
 #include <algorithm>
-#include <chrono>
 #include <cmath>
-#include <cstddef>
-#include <cstdint>
 #include <functional>
 #include <initializer_list>
 #include <iterator>
 #include <memory>
-#include <stdexcept>
-#include <tuple>
 #include <type_traits>
 #include <utility>
-#include <vector>
 
 /*
 
@@ -43,24 +37,23 @@ TODO
 namespace beast {
 namespace detail {
 
-/**
- * Associative container where each element is also indexed by time.
- *
- * This container mirrors the interface of the standard library unordered
- * associative containers, with the addition that each element is associated
- * with a `when` `time_point` which is obtained from the value of the clock's
- * `now`. The function `touch` updates the time for an element to the current
- * time as reported by the clock.
- *
- * An extra set of iterator types and member functions are provided in the
- * `chronological` memberspace that allow traversal in temporal or reverse
- * temporal order. This container is useful as a building block for caches
- * whose items expire after a certain amount of time. The chronological
- * iterators allow for fully customizable expiration strategies.
- *
- * @see aged_unordered_set, aged_unordered_multiset
- * @see aged_unordered_map, aged_unordered_multimap
- */
+/** Associative container where each element is also indexed by time.
+
+    This container mirrors the interface of the standard library unordered
+    associative containers, with the addition that each element is associated
+    with a `when` `time_point` which is obtained from the value of the clock's
+    `now`. The function `touch` updates the time for an element to the current
+    time as reported by the clock.
+
+    An extra set of iterator types and member functions are provided in the
+    `chronological` memberspace that allow traversal in temporal or reverse
+    temporal order. This container is useful as a building block for caches
+    whose items expire after a certain amount of time. The chronological
+    iterators allow for fully customizable expiration strategies.
+
+    @see aged_unordered_set, aged_unordered_multiset
+    @see aged_unordered_map, aged_unordered_multimap
+*/
 template <
     bool IsMulti,
     bool IsMap,
@@ -118,9 +111,10 @@ private:
         {
         }
 
-        template <class... Args>
+        template <
+            class... Args,
+            class = std::enable_if_t<std::is_constructible_v<value_type, Args...>>>
         Element(time_point const& when, Args&&... args)
-            requires(std::is_constructible_v<value_type, Args...>)
             : value(std::forward<Args>(args)...), when(when)
         {
         }
@@ -529,7 +523,6 @@ private:
     deleteElement(Element const* p)
     {
         ElementAllocatorTraits::destroy(config_.alloc(), p);
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast)
         ElementAllocatorTraits::deallocate(config_.alloc(), const_cast<Element*>(p), 1);
     }
 
@@ -842,25 +835,35 @@ public:
     //
     //--------------------------------------------------------------------------
 
-    template <class K, bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
+    template <
+        class K,
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
-    at(K const& k)
-        requires(MaybeMap && !MaybeMulti);
+    at(K const& k);
 
-    template <class K, bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
+    template <
+        class K,
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional<IsMap, T, void*>::type const&
-    at(K const& k) const
-        requires(MaybeMap && !MaybeMulti);
+    at(K const& k) const;
 
-    template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
+    template <
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
-    operator[](Key const& key)
-        requires(MaybeMap && !MaybeMulti);
+    operator[](Key const& key);
 
-    template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
+    template <
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
-    operator[](Key&& key)
-        requires(MaybeMap && !MaybeMulti);
+    operator[](Key&& key);
 
     //--------------------------------------------------------------------------
     //
@@ -958,32 +961,28 @@ public:
     // map, set
     template <bool MaybeMulti = IsMulti>
     auto
-    insert(value_type const& value) -> std::pair<iterator, bool>
-        requires(!MaybeMulti);
+    insert(value_type const& value) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multimap, multiset
     template <bool MaybeMulti = IsMulti>
     auto
-    insert(value_type const& value) -> iterator
-        requires MaybeMulti;
+    insert(value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>;
 
     // map, set
     template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
     auto
-    insert(value_type&& value) -> std::pair<iterator, bool>
-        requires(!MaybeMulti && !MaybeMap);
+    insert(value_type&& value)
+        -> std::enable_if_t<!MaybeMulti && !MaybeMap, std::pair<iterator, bool>>;
 
     // multimap, multiset
     template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
     auto
-    insert(value_type&& value) -> iterator
-        requires(MaybeMulti && !MaybeMap);
+    insert(value_type&& value) -> std::enable_if_t<MaybeMulti && !MaybeMap, iterator>;
 
     // map, set
     template <bool MaybeMulti = IsMulti>
-    iterator
+    std::enable_if_t<!MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type const& value)
-        requires(!MaybeMulti)
     {
         // Hint is ignored but we provide the interface so
         // callers may use ordered and unordered interchangeably.
@@ -992,9 +991,8 @@ public:
 
     // multimap, multiset
     template <bool MaybeMulti = IsMulti>
-    iterator
+    std::enable_if_t<MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type const& value)
-        requires MaybeMulti
     {
         // VFALCO TODO The hint could be used to let
         //             the client order equal ranges
@@ -1003,9 +1001,8 @@ public:
 
     // map, set
     template <bool MaybeMulti = IsMulti>
-    iterator
+    std::enable_if_t<!MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type&& value)
-        requires(!MaybeMulti)
     {
         // Hint is ignored but we provide the interface so
         // callers may use ordered and unordered interchangeably.
@@ -1014,9 +1011,8 @@ public:
 
     // multimap, multiset
     template <bool MaybeMulti = IsMulti>
-    iterator
+    std::enable_if_t<MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type&& value)
-        requires MaybeMulti
     {
         // VFALCO TODO The hint could be used to let
         //             the client order equal ranges
@@ -1025,18 +1021,20 @@ public:
 
     // map, multimap
     template <class P, bool MaybeMap = IsMap>
-    std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>
+    std::enable_if_t<
+        MaybeMap && std::is_constructible_v<value_type, P&&>,
+        std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>>
     insert(P&& value)
-        requires(MaybeMap && std::is_constructible_v<value_type, P &&>)
     {
         return emplace(std::forward<P>(value));
     }
 
     // map, multimap
     template <class P, bool MaybeMap = IsMap>
-    std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>
+    std::enable_if_t<
+        MaybeMap && std::is_constructible_v<value_type, P&&>,
+        std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>>
     insert(const_iterator hint, P&& value)
-        requires(MaybeMap && std::is_constructible_v<value_type, P &&>)
     {
         return emplaceHint(hint, std::forward<P>(value));
     }
@@ -1057,26 +1055,23 @@ public:
     // set, map
     template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplace(Args&&... args) -> std::pair<iterator, bool>
-        requires(!MaybeMulti);
+    emplace(Args&&... args) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multiset, multimap
     template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplace(Args&&... args) -> iterator
-        requires MaybeMulti;
+    emplace(Args&&... args) -> std::enable_if_t<MaybeMulti, iterator>;
 
     // set, map
     template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplaceHint(const_iterator /*hint*/, Args&&... args) -> std::pair<iterator, bool>
-        requires(!MaybeMulti);
+    emplaceHint(const_iterator /*hint*/, Args&&... args)
+        -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multiset, multimap
     template <bool MaybeMulti = IsMulti, class... Args>
-    iterator
+    std::enable_if_t<MaybeMulti, iterator>
     emplaceHint(const_iterator /*hint*/, Args&&... args)
-        requires MaybeMulti
     {
         // VFALCO TODO The hint could be used for multi, to let
         //             the client order equal ranges
@@ -1307,7 +1302,7 @@ public:
         class OtherHash,
         class OtherAllocator,
         bool MaybeMulti = IsMulti>
-    bool
+    std::enable_if_t<!MaybeMulti, bool>
     operator==(AgedUnorderedContainer<
                false,
                OtherIsMap,
@@ -1316,8 +1311,7 @@ public:
                OtherDuration,
                OtherHash,
                KeyEqual,
-               OtherAllocator> const& other) const
-        requires(!MaybeMulti);
+               OtherAllocator> const& other) const;
 
     template <
         bool OtherIsMap,
@@ -1327,7 +1321,7 @@ public:
         class OtherHash,
         class OtherAllocator,
         bool MaybeMulti = IsMulti>
-    bool
+    std::enable_if_t<MaybeMulti, bool>
     operator==(AgedUnorderedContainer<
                true,
                OtherIsMap,
@@ -1336,8 +1330,7 @@ public:
                OtherDuration,
                OtherHash,
                KeyEqual,
-               OtherAllocator> const& other) const
-        requires MaybeMulti;
+               OtherAllocator> const& other) const;
 
     template <
         bool OtherIsMulti,
@@ -1382,14 +1375,13 @@ private:
     // map, set
     template <bool MaybeMulti = IsMulti>
     auto
-    insertUnchecked(value_type const& value) -> std::pair<iterator, bool>
-        requires(!MaybeMulti);
+    insertUnchecked(value_type const& value)
+        -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multimap, multiset
     template <bool MaybeMulti = IsMulti>
     auto
-    insertUnchecked(value_type const& value) -> iterator
-        requires MaybeMulti;
+    insertUnchecked(value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>;
 
     template <class InputIt>
     void
@@ -1430,9 +1422,8 @@ private:
 
     template <
         bool MaybePropagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
-    void
+    std::enable_if_t<MaybePropagate>
     swapData(AgedUnorderedContainer& other) noexcept
-        requires MaybePropagate
     {
         std::swap(config_.hashFunction(), other.config_.hashFunction());
         std::swap(config_.keyEq(), other.config_.keyEq());
@@ -1442,9 +1433,8 @@ private:
 
     template <
         bool MaybePropagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
-    void
+    std::enable_if_t<!MaybePropagate>
     swapData(AgedUnorderedContainer& other) noexcept
-        requires(!MaybePropagate)
     {
         std::swap(config_.hashFunction(), other.config_.hashFunction());
         std::swap(config_.keyEq(), other.config_.keyEq());
@@ -2098,10 +2088,9 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <class K, bool MaybeMulti, bool MaybeMap>
+template <class K, bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::at(K const& k)
-    requires(MaybeMap && !MaybeMulti)
 {
     auto const iter(
         cont_.find(k, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual())));
@@ -2119,11 +2108,10 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <class K, bool MaybeMulti, bool MaybeMap>
+template <class K, bool MaybeMulti, bool MaybeMap, class>
 std::conditional<IsMap, T, void*>::type const&
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::at(
     K const& k) const
-    requires(MaybeMap && !MaybeMulti)
 {
     auto const iter(
         cont_.find(k, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual())));
@@ -2141,11 +2129,10 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool MaybeMulti, bool MaybeMap>
+template <bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator[](
     Key const& key)
-    requires(MaybeMap && !MaybeMulti)
 {
     maybeRehash(1);
     typename cont_type::insert_commit_data d;
@@ -2171,11 +2158,10 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool MaybeMulti, bool MaybeMap>
+template <bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator[](
     Key&& key)
-    requires(MaybeMap && !MaybeMulti)
 {
     maybeRehash(1);
     typename cont_type::insert_commit_data d;
@@ -2228,8 +2214,7 @@ template <
 template <bool MaybeMulti>
 auto
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
-    value_type const& value) -> std::pair<iterator, bool>
-    requires(!MaybeMulti)
+    value_type const& value) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     maybeRehash(1);
     typename cont_type::insert_commit_data d;
@@ -2258,8 +2243,7 @@ template <
 template <bool MaybeMulti>
 auto
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
-    value_type const& value) -> iterator
-    requires MaybeMulti
+    value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>
 {
     maybeRehash(1);
     Element* const p(newElement(value));
@@ -2281,8 +2265,7 @@ template <
 template <bool MaybeMulti, bool MaybeMap>
 auto
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
-    value_type&& value) -> std::pair<iterator, bool>
-    requires(!MaybeMulti && !MaybeMap)
+    value_type&& value) -> std::enable_if_t<!MaybeMulti && !MaybeMap, std::pair<iterator, bool>>
 {
     maybeRehash(1);
     typename cont_type::insert_commit_data d;
@@ -2311,8 +2294,7 @@ template <
 template <bool MaybeMulti, bool MaybeMap>
 auto
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
-    value_type&& value) -> iterator
-    requires(MaybeMulti && !MaybeMap)
+    value_type&& value) -> std::enable_if_t<MaybeMulti && !MaybeMap, iterator>
 {
     maybeRehash(1);
     Element* const p(newElement(std::move(value)));
@@ -2321,6 +2303,7 @@ AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>
     return iterator(iter);
 }
 
+#if 1  // Use insert() instead of insert_check() insert_commit()
 // set, map
 template <
     bool IsMulti,
@@ -2334,8 +2317,7 @@ template <
 template <bool MaybeMulti, class... Args>
 auto
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplace(
-    Args&&... args) -> std::pair<iterator, bool>
-    requires(!MaybeMulti)
+    Args&&... args) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     maybeRehash(1);
     // VFALCO NOTE Its unfortunate that we need to
@@ -2350,6 +2332,42 @@ AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>
     deleteElement(p);
     return std::make_pair(iterator(result.first), false);
 }
+#else   // As original, use insert_check() / insert_commit () pair.
+// set, map
+template <
+    bool IsMulti,
+    bool IsMap,
+    class Key,
+    class T,
+    class Clock,
+    class Hash,
+    class KeyEqual,
+    class Allocator>
+template <bool maybe_multi, class... Args>
+auto
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplace(
+    Args&&... args) -> typename std::enable_if<!maybe_multi, std::pair<iterator, bool>>::type
+{
+    maybe_rehash(1);
+    // VFALCO NOTE Its unfortunate that we need to
+    //             construct element here
+    element* const p(new_element(std::forward<Args>(args)...));
+    typename cont_type::insert_commit_data d;
+    auto const result(m_cont.insert_check(
+        extract(p->value),
+        std::cref(m_config.hashFunction()),
+        std::cref(m_config.keyValueEqual()),
+        d));
+    if (result.second)
+    {
+        auto const iter(m_cont.insert_commit(*p, d));
+        chronological.list.push_back(*p);
+        return std::make_pair(iterator(iter), true);
+    }
+    delete_element(p);
+    return std::make_pair(iterator(result.first), false);
+}
+#endif  // 0
 
 // multiset, multimap
 template <
@@ -2364,8 +2382,7 @@ template <
 template <bool MaybeMulti, class... Args>
 auto
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplace(
-    Args&&... args) -> iterator
-    requires MaybeMulti
+    Args&&... args) -> std::enable_if_t<MaybeMulti, iterator>
 {
     maybeRehash(1);
     Element* const p(newElement(std::forward<Args>(args)...));
@@ -2388,8 +2405,7 @@ template <bool MaybeMulti, class... Args>
 auto
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplaceHint(
     const_iterator /*hint*/,
-    Args&&... args) -> std::pair<iterator, bool>
-    requires(!MaybeMulti)
+    Args&&... args) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     maybeRehash(1);
     // VFALCO NOTE Its unfortunate that we need to
@@ -2540,7 +2556,7 @@ template <
     class OtherHash,
     class OtherAllocator,
     bool MaybeMulti>
-bool
+std::enable_if_t<!MaybeMulti, bool>
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator==(
     AgedUnorderedContainer<
         false,
@@ -2551,7 +2567,6 @@ AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>
         OtherHash,
         KeyEqual,
         OtherAllocator> const& other) const
-    requires(!MaybeMulti)
 {
     if (size() != other.size())
         return false;
@@ -2581,7 +2596,7 @@ template <
     class OtherHash,
     class OtherAllocator,
     bool MaybeMulti>
-bool
+std::enable_if_t<MaybeMulti, bool>
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator==(
     AgedUnorderedContainer<
         true,
@@ -2592,7 +2607,6 @@ AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>
         OtherHash,
         KeyEqual,
         OtherAllocator> const& other) const
-    requires MaybeMulti
 {
     if (size() != other.size())
         return false;
@@ -2629,8 +2643,7 @@ template <
 template <bool MaybeMulti>
 auto
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insertUnchecked(
-    value_type const& value) -> std::pair<iterator, bool>
-    requires(!MaybeMulti)
+    value_type const& value) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     typename cont_type::insert_commit_data d;
     auto const result(cont_.insert_check(
@@ -2658,8 +2671,7 @@ template <
 template <bool MaybeMulti>
 auto
 AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insertUnchecked(
-    value_type const& value) -> iterator
-    requires MaybeMulti
+    value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>
 {
     Element* const p(newElement(value));
     chronological.list_.push_back(*p);
@@ -2710,9 +2722,7 @@ swap(
     lhs.swap(rhs);
 }
 
-/**
- * Expire aged container items past the specified age.
- */
+/** Expire aged container items past the specified age. */
 template <
     bool IsMulti,
     bool IsMap,

include/xrpl/beast/core/CurrentThreadName.h

@@ -6,16 +6,14 @@
 
 #include <boost/predef.h>
 
-#include <cstddef>
 #include <string>
 #include <string_view>
 
 namespace beast {
 
-/**
- * Changes the name of the caller thread.
- * Different OSes may place different length or content limits on this name.
- */
+/** Changes the name of the caller thread.
+    Different OSes may place different length or content limits on this name.
+*/
 void
 setCurrentThreadName(std::string_view newThreadName);
 
@@ -25,14 +23,13 @@ setCurrentThreadName(std::string_view newThreadName);
 // Maximum number of characters is therefore 15.
 constexpr std::size_t kMaxThreadNameLength = 15;
 
-/**
- * Sets the name of the caller thread with compile-time size checking.
- * @tparam N The size of the string literal including null terminator
- * @param newThreadName A string literal to set as the thread name
- *
- * This template overload enforces that thread names are at most 16 characters
- * (including null terminator) at compile time, matching Linux's limit.
- */
+/** Sets the name of the caller thread with compile-time size checking.
+    @tparam N The size of the string literal including null terminator
+    @param newThreadName A string literal to set as the thread name
+
+    This template overload enforces that thread names are at most 16 characters
+    (including null terminator) at compile time, matching Linux's limit.
+*/
 template <std::size_t N>
 void
 setCurrentThreadName(char const (&newThreadName)[N])
@@ -43,15 +40,14 @@ setCurrentThreadName(char const (&newThreadName)[N])
 }
 #endif
 
-/**
- * Returns the name of the caller thread.
- *
- * The name returned is the name as set by a call to setCurrentThreadName().
- * If the thread name is set by an external force, then that name change
- * will not be reported.
- *
- * If no name has ever been set, then the empty string is returned.
- */
+/** Returns the name of the caller thread.
+
+    The name returned is the name as set by a call to setCurrentThreadName().
+    If the thread name is set by an external force, then that name change
+    will not be reported.
+
+    If no name has ever been set, then the empty string is returned.
+*/
 std::string
 getCurrentThreadName();
 

include/xrpl/beast/core/LexicalCast.h

@@ -5,12 +5,11 @@
 #include <boost/core/detail/string_view.hpp>
 
 #include <algorithm>
-#include <cctype>
+#include <cerrno>
 #include <charconv>
+#include <cstdlib>
 #include <iterator>
 #include <string>
-#include <string_view>
-#include <system_error>
 #include <type_traits>
 #include <typeinfo>
 
@@ -29,18 +28,16 @@ struct LexicalCast<std::string, In>
     explicit LexicalCast() = default;
 
     template <class Arithmetic = In>
-    bool
+    std::enable_if_t<std::is_arithmetic_v<Arithmetic>, bool>
     operator()(std::string& out, Arithmetic in)
-        requires(std::is_arithmetic_v<Arithmetic>)
     {
         out = std::to_string(in);
         return true;
     }
 
     template <class Enumeration = In>
-    bool
+    std::enable_if_t<std::is_enum_v<Enumeration>, bool>
     operator()(std::string& out, Enumeration in)
-        requires(std::is_enum_v<Enumeration>)
     {
         out = std::to_string(static_cast<std::underlying_type_t<Enumeration>>(in));
         return true;
@@ -58,9 +55,8 @@ struct LexicalCast<Out, std::string_view>
         "beast::LexicalCast can only be used with integral types");
 
     template <class Integral = Out>
-    bool
+    std::enable_if_t<std::is_integral_v<Integral> && !std::is_same_v<Integral, bool>, bool>
     operator()(Integral& out, std::string_view in) const
-        requires(std::is_integral_v<Integral> && !std::is_same_v<Integral, bool>)
     {
         auto first = in.data();
         auto last = in.data() + in.size();
@@ -163,19 +159,17 @@ struct LexicalCast<Out, char*>
 
 //------------------------------------------------------------------------------
 
-/**
- * Thrown when a conversion is not possible with LexicalCast.
- * Only used in the throw variants of lexicalCast.
- */
+/** Thrown when a conversion is not possible with LexicalCast.
+    Only used in the throw variants of lexicalCast.
+*/
 struct BadLexicalCast : public std::bad_cast
 {
     explicit BadLexicalCast() = default;
 };
 
-/**
- * Intelligently convert from one type to another.
- * @return `false` if there was a parsing or range error
- */
+/** Intelligently convert from one type to another.
+    @return `false` if there was a parsing or range error
+*/
 template <class Out, class In>
 bool
 lexicalCastChecked(Out& out, In in)
@@ -183,13 +177,12 @@ lexicalCastChecked(Out& out, In in)
     return detail::LexicalCast<Out, In>()(out, in);
 }
 
-/**
- * Convert from one type to another, throw on error
- *
- * An exception of type BadLexicalCast is thrown if the conversion fails.
- *
- * @return The new type.
- */
+/** Convert from one type to another, throw on error
+
+    An exception of type BadLexicalCast is thrown if the conversion fails.
+
+    @return The new type.
+*/
 template <class Out, class In>
 Out
 lexicalCastThrow(In in)
@@ -200,12 +193,11 @@ lexicalCastThrow(In in)
     throw BadLexicalCast();
 }
 
-/**
- * Convert from one type to another.
- *
- * @param defaultValue The value returned if parsing fails
- * @return The new type.
- */
+/** Convert from one type to another.
+
+    @param defaultValue The value returned if parsing fails
+    @return The new type.
+*/
 template <class Out, class In>
 Out
 lexicalCast(In in, Out defaultValue = Out())

include/xrpl/beast/core/List.h

@@ -1,8 +1,6 @@
 #pragma once
 
-#include <cstddef>
 #include <iterator>
-#include <type_traits>
 
 namespace beast {
 
@@ -11,9 +9,7 @@ class List;
 
 namespace detail {
 
-/**
- * Copy `const` attribute from T to U if present.
- */
+/** Copy `const` attribute from T to U if present. */
 /** @{ */
 template <typename T, typename U>
 struct CopyConst
@@ -155,111 +151,110 @@ private:
 
 }  // namespace detail
 
-/**
- * Intrusive doubly linked list.
- *
- * This intrusive List is a container similar in operation to std::list in the
- * Standard Template Library (STL). Like all @ref intrusive containers, List
- * requires you to first derive your class from List<>::Node:
- *
- * @code
- *
- * struct Object : List <Object>::Node
- * {
- *     explicit Object (int value) : value_ (value)
- *     {
- *     }
- *
- *     int value_;
- * };
- *
- * @endcode
- *
- * Now we define the list, and add a couple of items.
- *
- * @code
- *
- * List <Object> list;
- *
- * list.push_back (* (new Object (1)));
- * list.push_back (* (new Object (2)));
- *
- * @endcode
- *
- * For compatibility with the standard containers, push_back() expects a
- * reference to the object. Unlike the standard container, however, push_back()
- * places the actual object in the list and not a copy-constructed duplicate.
- *
- * Iterating over the list follows the same idiom as the STL:
- *
- * @code
- *
- * for (List <Object>::iterator iter = list.begin(); iter != list.end; ++iter)
- *     std::cout << iter->value_;
- *
- * @endcode
- *
- * You can even use BOOST_FOREACH, or range based for loops:
- *
- * @code
- *
- * BOOST_FOREACH (Object& object, list)  // boost only
- *     std::cout << object.value_;
- *
- * for (Object& object : list)           // C++11 only
- *     std::cout << object.value_;
- *
- * @endcode
- *
- * Because List is mostly STL compliant, it can be passed into STL algorithms:
- * e.g. `std::for_each()` or `std::find_first_of()`.
- *
- * In general, objects placed into a List should be dynamically allocated
- * although this cannot be enforced at compile time. Since the caller provides
- * the storage for the object, the caller is also responsible for deleting the
- * object. An object still exists after being removed from a List, until the
- * caller deletes it. This means an element can be moved from one List to
- * another with practically no overhead.
- *
- * Unlike the standard containers, an object may only exist in one list at a
- * time, unless special preparations are made. The Tag template parameter is
- * used to distinguish between different list types for the same object,
- * allowing the object to exist in more than one list simultaneously.
- *
- * For example, consider an actor system where a global list of actors is
- * maintained, so that they can each be periodically receive processing
- * time. We wish to also maintain a list of the subset of actors that require
- * a domain-dependent update. To achieve this, we declare two tags, the
- * associated list types, and the list element thusly:
- *
- * @code
- *
- * struct Actor;         // Forward declaration required
- *
- * struct ProcessTag { };
- * struct UpdateTag { };
- *
- * using ProcessList = List <Actor, ProcessTag>;
- * using UpdateList = List <Actor, UpdateTag>;
- *
- * // Derive from both node types so we can be in each list at once.
- * //
- * struct Actor : ProcessList::Node, UpdateList::Node
- * {
- *     bool process ();    // returns true if we need an update
- *     void update ();
- * };
- *
- * @endcode
- *
- * @tparam T The base type of element which the list will store
- *                 pointers to.
- *
- * @tparam Tag An optional unique type name used to distinguish lists and
- * nodes, when the object can exist in multiple lists simultaneously.
- *
- * @ingroup beast_core intrusive
- */
+/** Intrusive doubly linked list.
+
+    This intrusive List is a container similar in operation to std::list in the
+    Standard Template Library (STL). Like all @ref intrusive containers, List
+    requires you to first derive your class from List<>::Node:
+
+    @code
+
+    struct Object : List <Object>::Node
+    {
+        explicit Object (int value) : value_ (value)
+        {
+        }
+
+        int value_;
+    };
+
+    @endcode
+
+    Now we define the list, and add a couple of items.
+
+    @code
+
+    List <Object> list;
+
+    list.push_back (* (new Object (1)));
+    list.push_back (* (new Object (2)));
+
+    @endcode
+
+    For compatibility with the standard containers, push_back() expects a
+    reference to the object. Unlike the standard container, however, push_back()
+    places the actual object in the list and not a copy-constructed duplicate.
+
+    Iterating over the list follows the same idiom as the STL:
+
+    @code
+
+    for (List <Object>::iterator iter = list.begin(); iter != list.end; ++iter)
+        std::cout << iter->value_;
+
+    @endcode
+
+    You can even use BOOST_FOREACH, or range based for loops:
+
+    @code
+
+    BOOST_FOREACH (Object& object, list)  // boost only
+        std::cout << object.value_;
+
+    for (Object& object : list)           // C++11 only
+        std::cout << object.value_;
+
+    @endcode
+
+    Because List is mostly STL compliant, it can be passed into STL algorithms:
+    e.g. `std::for_each()` or `std::find_first_of()`.
+
+    In general, objects placed into a List should be dynamically allocated
+    although this cannot be enforced at compile time. Since the caller provides
+    the storage for the object, the caller is also responsible for deleting the
+    object. An object still exists after being removed from a List, until the
+    caller deletes it. This means an element can be moved from one List to
+    another with practically no overhead.
+
+    Unlike the standard containers, an object may only exist in one list at a
+    time, unless special preparations are made. The Tag template parameter is
+    used to distinguish between different list types for the same object,
+    allowing the object to exist in more than one list simultaneously.
+
+    For example, consider an actor system where a global list of actors is
+    maintained, so that they can each be periodically receive processing
+    time. We wish to also maintain a list of the subset of actors that require
+    a domain-dependent update. To achieve this, we declare two tags, the
+    associated list types, and the list element thusly:
+
+    @code
+
+    struct Actor;         // Forward declaration required
+
+    struct ProcessTag { };
+    struct UpdateTag { };
+
+    using ProcessList = List <Actor, ProcessTag>;
+    using UpdateList = List <Actor, UpdateTag>;
+
+    // Derive from both node types so we can be in each list at once.
+    //
+    struct Actor : ProcessList::Node, UpdateList::Node
+    {
+        bool process ();    // returns true if we need an update
+        void update ();
+    };
+
+    @endcode
+
+    @tparam T The base type of element which the list will store
+                    pointers to.
+
+    @tparam Tag An optional unique type name used to distinguish lists and
+   nodes, when the object can exist in multiple lists simultaneously.
+
+    @ingroup beast_core intrusive
+*/
 template <typename T, typename Tag = void>
 class List
 {
@@ -277,9 +272,7 @@ public:
     using iterator = detail::ListIterator<Node>;
     using const_iterator = detail::ListIterator<Node const>;
 
-    /**
-     * Create an empty list.
-     */
+    /** Create an empty list. */
     List()
     {
         head_.prev_ = nullptr;  // identifies the head
@@ -291,133 +284,119 @@ public:
     List&
     operator=(List const&) = delete;
 
-    /**
-     * Determine if the list is empty.
-     * @return `true` if the list is empty.
-     */
+    /** Determine if the list is empty.
+        @return `true` if the list is empty.
+    */
     [[nodiscard]] bool
     empty() const noexcept
     {
         return size() == 0;
     }
 
-    /**
-     * Returns the number of elements in the list.
-     */
+    /** Returns the number of elements in the list. */
     [[nodiscard]] size_type
     size() const noexcept
     {
         return size_;
     }
 
-    /**
-     * Obtain a reference to the first element.
-     * @invariant The list may not be empty.
-     * @return A reference to the first element.
-     */
+    /** Obtain a reference to the first element.
+        @invariant The list may not be empty.
+        @return A reference to the first element.
+    */
     reference
     front() noexcept
     {
         return element_from(head_.next_);
     }
 
-    /**
-     * Obtain a const reference to the first element.
-     * @invariant The list may not be empty.
-     * @return A const reference to the first element.
-     */
+    /** Obtain a const reference to the first element.
+        @invariant The list may not be empty.
+        @return A const reference to the first element.
+    */
     [[nodiscard]] const_reference
     front() const noexcept
     {
         return element_from(head_.next_);
     }
 
-    /**
-     * Obtain a reference to the last element.
-     * @invariant The list may not be empty.
-     * @return A reference to the last element.
-     */
+    /** Obtain a reference to the last element.
+        @invariant The list may not be empty.
+        @return A reference to the last element.
+    */
     reference
     back() noexcept
     {
         return element_from(tail_.prev_);
     }
 
-    /**
-     * Obtain a const reference to the last element.
-     * @invariant The list may not be empty.
-     * @return A const reference to the last element.
-     */
+    /** Obtain a const reference to the last element.
+        @invariant The list may not be empty.
+        @return A const reference to the last element.
+    */
     [[nodiscard]] const_reference
     back() const noexcept
     {
         return element_from(tail_.prev_);
     }
 
-    /**
-     * Obtain an iterator to the beginning of the list.
-     * @return An iterator pointing to the beginning of the list.
-     */
+    /** Obtain an iterator to the beginning of the list.
+        @return An iterator pointing to the beginning of the list.
+    */
     iterator
     begin() noexcept
     {
         return iterator(head_.next_);
     }
 
-    /**
-     * Obtain a const iterator to the beginning of the list.
-     * @return A const iterator pointing to the beginning of the list.
-     */
+    /** Obtain a const iterator to the beginning of the list.
+        @return A const iterator pointing to the beginning of the list.
+    */
     [[nodiscard]] const_iterator
     begin() const noexcept
     {
         return const_iterator(head_.next_);
     }
 
-    /**
-     * Obtain a const iterator to the beginning of the list.
-     * @return A const iterator pointing to the beginning of the list.
-     */
+    /** Obtain a const iterator to the beginning of the list.
+        @return A const iterator pointing to the beginning of the list.
+    */
     [[nodiscard]] const_iterator
     cbegin() const noexcept
     {
         return const_iterator(head_.next_);
     }
 
-    /**
-     * Obtain a iterator to the end of the list.
-     * @return An iterator pointing to the end of the list.
-     */
+    /** Obtain a iterator to the end of the list.
+        @return An iterator pointing to the end of the list.
+    */
     iterator
     end() noexcept
     {
         return iterator(&tail_);
     }
 
-    /**
-     * Obtain a const iterator to the end of the list.
-     * @return A constiterator pointing to the end of the list.
-     */
+    /** Obtain a const iterator to the end of the list.
+        @return A constiterator pointing to the end of the list.
+    */
     [[nodiscard]] const_iterator
     end() const noexcept
     {
         return const_iterator(&tail_);
     }
 
-    /**
-     * Obtain a const iterator to the end of the list
-     * @return A constiterator pointing to the end of the list.
-     */
+    /** Obtain a const iterator to the end of the list
+        @return A constiterator pointing to the end of the list.
+    */
     [[nodiscard]] const_iterator
     cend() const noexcept
     {
         return const_iterator(&tail_);
     }
 
-    /**
-     * Clear the list.
-     * @note This does not free the elements.
-     */
+    /** Clear the list.
+        @note This does not free the elements.
+    */
     void
     clear() noexcept
     {
@@ -426,13 +405,12 @@ public:
         size_ = 0;
     }
 
-    /**
-     * Insert an element.
-     * @invariant The element must not already be in the list.
-     * @param pos The location to insert after.
-     * @param element The element to insert.
-     * @return An iterator pointing to the newly inserted element.
-     */
+    /** Insert an element.
+        @invariant The element must not already be in the list.
+        @param pos The location to insert after.
+        @param element The element to insert.
+        @return An iterator pointing to the newly inserted element.
+    */
     iterator
     insert(iterator pos, T& element) noexcept
     {
@@ -445,12 +423,11 @@ public:
         return iterator(node);
     }
 
-    /**
-     * Insert another list into this one.
-     * The other list is cleared.
-     * @param pos The location to insert after.
-     * @param other The list to insert.
-     */
+    /** Insert another list into this one.
+        The other list is cleared.
+        @param pos The location to insert after.
+        @param other The list to insert.
+    */
     void
     insert(iterator pos, List& other) noexcept
     {
@@ -466,12 +443,11 @@ public:
         }
     }
 
-    /**
-     * Remove an element.
-     * @invariant The element must exist in the list.
-     * @param pos An iterator pointing to the element to remove.
-     * @return An iterator pointing to the next element after the one removed.
-     */
+    /** Remove an element.
+        @invariant The element must exist in the list.
+        @param pos An iterator pointing to the element to remove.
+        @return An iterator pointing to the next element after the one removed.
+    */
     iterator
     erase(iterator pos) noexcept
     {
@@ -483,22 +459,20 @@ public:
         return pos;
     }
 
-    /**
-     * Insert an element at the beginning of the list.
-     * @invariant The element must not exist in the list.
-     * @param element The element to insert.
-     */
+    /** Insert an element at the beginning of the list.
+        @invariant The element must not exist in the list.
+        @param element The element to insert.
+    */
     iterator
     pushFront(T& element) noexcept
     {
         return insert(begin(), element);
     }
 
-    /**
-     * Remove the element at the beginning of the list.
-     * @invariant The list must not be empty.
-     * @return A reference to the popped element.
-     */
+    /** Remove the element at the beginning of the list.
+        @invariant The list must not be empty.
+        @return A reference to the popped element.
+    */
     T&
     popFront() noexcept
     {
@@ -507,22 +481,20 @@ public:
         return element;
     }
 
-    /**
-     * Append an element at the end of the list.
-     * @invariant The element must not exist in the list.
-     * @param element The element to append.
-     */
+    /** Append an element at the end of the list.
+        @invariant The element must not exist in the list.
+        @param element The element to append.
+    */
     iterator
     pushBack(T& element) noexcept
     {
         return insert(end(), element);
     }
 
-    /**
-     * Remove the element at the end of the list.
-     * @invariant The list must not be empty.
-     * @return A reference to the popped element.
-     */
+    /** Remove the element at the end of the list.
+        @invariant The list must not be empty.
+        @return A reference to the popped element.
+    */
     T&
     popBack() noexcept
     {
@@ -531,9 +503,7 @@ public:
         return element;
     }
 
-    /**
-     * Swap contents with another list.
-     */
+    /** Swap contents with another list. */
     void
     swap(List& other) noexcept
     {
@@ -543,46 +513,42 @@ public:
         append(temp);
     }
 
-    /**
-     * Insert another list at the beginning of this list.
-     * The other list is cleared.
-     * @param list The other list to insert.
-     */
+    /** Insert another list at the beginning of this list.
+        The other list is cleared.
+        @param list The other list to insert.
+    */
     iterator
     prepend(List& list) noexcept
     {
         return insert(begin(), list);
     }
 
-    /**
-     * Append another list at the end of this list.
-     * The other list is cleared.
-     * @param list the other list to append.
-     */
+    /** Append another list at the end of this list.
+        The other list is cleared.
+        @param list the other list to append.
+    */
     iterator
     append(List& list) noexcept
     {
         return insert(end(), list);
     }
 
-    /**
-     * Obtain an iterator from an element.
-     * @invariant The element must exist in the list.
-     * @param element The element to obtain an iterator for.
-     * @return An iterator to the element.
-     */
+    /** Obtain an iterator from an element.
+        @invariant The element must exist in the list.
+        @param element The element to obtain an iterator for.
+        @return An iterator to the element.
+    */
     iterator
     iteratorTo(T& element) const noexcept
     {
         return iterator(static_cast<Node*>(&element));
     }
 
-    /**
-     * Obtain a const iterator from an element.
-     * @invariant The element must exist in the list.
-     * @param element The element to obtain an iterator for.
-     * @return A const iterator to the element.
-     */
+    /** Obtain a const iterator from an element.
+        @invariant The element must exist in the list.
+        @param element The element to obtain an iterator for.
+        @return A const iterator to the element.
+    */
     [[nodiscard]] const_iterator
     constIteratorTo(T const& element) const noexcept
     {

include/xrpl/beast/core/LockFreeStack.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <atomic>
-#include <cstddef>
 #include <iterator>
 #include <type_traits>
 
@@ -41,7 +40,7 @@ public:
     operator=(NodePtr node)
     {
         node_ = node;
-        return *this;
+        return static_cast<LockFreeStackIterator&>(*this);
     }
 
     LockFreeStackIterator&
@@ -59,7 +58,7 @@ public:
         return result;
     }
 
-    [[nodiscard]] NodePtr
+    NodePtr
     node() const
     {
         return node_;
@@ -103,19 +102,18 @@ operator!=(
 
 //------------------------------------------------------------------------------
 
-/**
- * Multiple Producer, Multiple Consumer (MPMC) intrusive stack.
- *
- * This stack is implemented using the same intrusive interface as List.
- * All mutations are lock-free.
- *
- * The caller is responsible for preventing the "ABA" problem:
- *     http://en.wikipedia.org/wiki/ABA_problem
- *
- * @param Tag  A type name used to distinguish lists and nodes, for
- *             putting objects in multiple lists. If this parameter is
- *             omitted, the default tag is used.
- */
+/** Multiple Producer, Multiple Consumer (MPMC) intrusive stack.
+
+    This stack is implemented using the same intrusive interface as List.
+    All mutations are lock-free.
+
+    The caller is responsible for preventing the "ABA" problem:
+        http://en.wikipedia.org/wiki/ABA_problem
+
+    @param Tag  A type name used to distinguish lists and nodes, for
+                putting objects in multiple lists. If this parameter is
+                omitted, the default tag is used.
+*/
 template <class Element, class Tag = void>
 class LockFreeStack
 {
@@ -163,27 +161,24 @@ public:
     LockFreeStack&
     operator=(LockFreeStack const&) = delete;
 
-    /**
-     * Returns true if the stack is empty.
-     */
+    /** Returns true if the stack is empty. */
     [[nodiscard]] bool
     empty() const
     {
         return head_.load() == &end_;
     }
 
-    /**
-     * Push a node onto the stack.
-     * The caller is responsible for preventing the ABA problem.
-     * This operation is lock-free.
-     * Thread safety:
-     *     Safe to call from any thread.
-     *
-     * @param node The node to push.
-     *
-     * @return `true` if the stack was previously empty. If multiple threads
-     *         are attempting to push, only one will receive `true`.
-     */
+    /** Push a node onto the stack.
+        The caller is responsible for preventing the ABA problem.
+        This operation is lock-free.
+        Thread safety:
+            Safe to call from any thread.
+
+        @param node The node to push.
+
+        @return `true` if the stack was previously empty. If multiple threads
+                are attempting to push, only one will receive `true`.
+    */
     // VFALCO NOTE Fix this, shouldn't it be a reference like intrusive list?
     bool
     pushFront(Node* node)
@@ -199,16 +194,15 @@ public:
         return first;
     }
 
-    /**
-     * Pop an element off the stack.
-     * The caller is responsible for preventing the ABA problem.
-     * This operation is lock-free.
-     * Thread safety:
-     *     Safe to call from any thread.
-     *
-     * @return The element that was popped, or `nullptr` if the stack
-     *         was empty.
-     */
+    /** Pop an element off the stack.
+        The caller is responsible for preventing the ABA problem.
+        This operation is lock-free.
+        Thread safety:
+            Safe to call from any thread.
+
+        @return The element that was popped, or `nullptr` if the stack
+                was empty.
+    */
     Element*
     popFront()
     {
@@ -224,13 +218,12 @@ public:
         return static_cast<Element*>(node);
     }
 
-    /**
-     * Return a forward iterator to the beginning or end of the stack.
-     * Undefined behavior results if push_front or pop_front is called
-     * while an iteration is in progress.
-     * Thread safety:
-     *     Caller is responsible for synchronization.
-     */
+    /** Return a forward iterator to the beginning or end of the stack.
+        Undefined behavior results if push_front or pop_front is called
+        while an iteration is in progress.
+        Thread safety:
+            Caller is responsible for synchronization.
+    */
     /** @{ */
     iterator
     begin()