Skip to content

fix issue #22920 by including unordered_map in tools/server/server-ht…#24089

Merged
ggerganov merged 1 commit into
ggml-org:masterfrom
abawany:master
Jun 4, 2026
Merged

fix issue #22920 by including unordered_map in tools/server/server-ht…#24089
ggerganov merged 1 commit into
ggml-org:masterfrom
abawany:master

Conversation

@abawany
Copy link
Copy Markdown
Contributor

@abawany abawany commented Jun 3, 2026

…tp.h

Overview

This includes a fix for issue #22920 where a missing include for unordered_map in tools/server/server-http.h causes a compile-time break in macos 15.xx. The latest main branch now builds on macos 15.7.7.

Additional information

Requirements

@abawany abawany requested a review from a team as a code owner June 3, 2026 19:47
@ggerganov ggerganov merged commit 0066404 into ggml-org:master Jun 4, 2026
24 of 25 checks passed
gabe-l-hart added a commit to gabe-l-hart/llama.cpp that referenced this pull request Jun 4, 2026
* origin/master: (57 commits)
server : disable on-device spec checkpoints (ggml-org#24108)
arg: fix double mtp downloads (ggml-org#24128)
webui: [a11y] fix keyboard navigation issues in chat interface and sidebar (ggml-org#23132)
Move duplicated imatrix code into single common imatrix-loader.cpp (ggml-org#22445)
ui: Fixed packages (ggml-org#24119)
ui: added single line reasoning preview (ggml-org#23601)
return filter to save memory (ggml-org#24125)
convert: Fix Gemma 4 Unified conversion (ggml-org#24118)
ggml: vectorize ggml_vec_dot_q4_1_q8_1 with WASM SIMD128 (ggml-org#22209)
server: avoid unnecessary checkpoint restore when new tokens are present (ggml-org#24110)
agents: refactor, include more guidelines (ggml-org#24111)
webui: fix tool selector toggle/counter, key tools by stable identity (ggml-org#24065)
build : use umbrella Headers directory for XCFramework module map (ggml-org#23974)
server : add header to tools/server/server-http.h (ggml-org#24089)
cmake: skip cvector-generator and export-lora when CPU backend is disabled (ggml-org#24053)
fix(mtmd): handle Gemma 4 audio projector embedding size (ggml-org#24091)
readme : add status badges (ggml-org#24104)
tests : refactor test-save-load-state to accept token input (ggml-org#24073)
metal : reduce rset heartbeat from 500ms -> 5ms (ggml-org#24074)
ggml-webgpu: FlashAttention refactor + standardize quantization support (ggml-org#23834)
...
jimbothigpen pushed a commit to jimbothigpen/llama.cpp that referenced this pull request Jun 6, 2026
jimbothigpen pushed a commit to jimbothigpen/llama.cpp that referenced this pull request Jun 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants