From 35dd1b0ca7c703bae93c46046ee8858a25ce8929 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 Oct 2025 23:44:29 +0100 Subject: Move JSONServer State to avoid ODR violation. --- src/lib/json_server.cc | 9 --------- src/lib/json_server.h | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc index 59aeb2c8e..921065bb2 100644 --- a/src/lib/json_server.cc +++ b/src/lib/json_server.cc @@ -45,15 +45,6 @@ using boost::thread; #define MAX_LENGTH 512 -enum State { - AWAITING_G, - AWAITING_E, - AWAITING_T, - AWAITING_SPACE, - READING_URL, -}; - - JSONServer::JSONServer (int port) { #ifdef DCPOMATIC_LINUX diff --git a/src/lib/json_server.h b/src/lib/json_server.h index c97e496d1..ade503f88 100644 --- a/src/lib/json_server.h +++ b/src/lib/json_server.h @@ -26,6 +26,14 @@ public: explicit JSONServer (int port); private: + enum State { + AWAITING_G, + AWAITING_E, + AWAITING_T, + AWAITING_SPACE, + READING_URL, + }; + void run (int port); void handle (std::shared_ptr socket); void request (std::string url, std::shared_ptr socket); -- cgit v1.2.3