Ettore Di Giacinto bd4d166c6f fix(ik-llama): align json alias to ordered_json to resolve mtmd.h conflict (#10534) ...

mtmd.h declares `using json = nlohmann::ordered_json` at global scope (and its
mtmd.cpp depends on it), while ik_llama's whole server/common stack also uses
ordered_json. Our grpc-server.cpp/utils.hpp kept a plain `nlohmann::json` alias,
which now collides with mtmd.h once it is included for the multimodal port:
"conflicting declaration 'using json = ...'". Switch our two aliases to
ordered_json to match; it is API-compatible (utils.hpp already used ordered_json
for its log helper) and our json never crosses into an unordered-json API.

Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
Assisted-by: Claude:claude-opus-4-8 [Claude Code]

2026-06-27 23:41:50 +00:00

..

ds4

chore: ⬆️ Update antirez/ds4 to 80ebbc396aee40eedc1d829222f3362d10fa4c6c (#10378)

2026-06-18 00:32:13 +02:00

grpc

fix: speedup git submodule update with --single-branch (#2847)

2024-07-13 22:32:25 +02:00

ik-llama-cpp

fix(ik-llama): align json alias to ordered_json to resolve mtmd.h conflict (#10534)

2026-06-27 23:41:50 +00:00

llama-cpp

fix(llama-cpp): stop reinterpreting plain-string message content as JSON (#10524) (#10538)

2026-06-27 01:42:05 +02:00

privacy-filter

feat(backends): darwin/Metal build for the privacy-filter backend (#10513)

2026-06-26 01:18:41 +02:00

turboquant

fix(backends): quote $CURDIR in run.sh (fixes backends in paths with spaces) (#10519)

2026-06-26 01:02:48 +02:00

run-unit-tests.sh

fix(llama-cpp): stop reinterpreting plain-string message content as JSON (#10524) (#10538)

2026-06-27 01:42:05 +02:00