mirror of
https://github.com/simdjson/simdjson
synced 2026-06-08 17:27:07 +00:00
2a481a4124
Resolved conflicts in: - include/simdjson/generic/ondemand/json_builder.h - include/simdjson/generic/ondemand/json_string_builder-inl.h - include/simdjson/generic/ondemand/std_deserialize.h Conflict resolution strategy: - Preserved ablation study infrastructure (SIMDJSON_ABLATION_* macros) - Integrated master's improvements: - Use constevalutil:: namespace for consteval functions - Added require_custom_serialization constraints - Added constexpr qualifiers to functions - Updated reflection API to use access_context::unchecked() - Improved optional member handling in deserialization