Merge pull request #473 from lo-simon/fix-boost-lock-error-define

lo-simon · web-flow · commit d9d2b831c338 · 2025-11-14T14:06:23.000Z
Fix C++11 build using boost
diff --git a/Development/nmos/api_utils.cpp b/Development/nmos/api_utils.cpp
@@ -651,12 +651,14 @@ namespace nmos
                 slog::log<slog::severities::warning>(gate, SLOG_FLF) << "HTTP error: " << e.what() << " [" << e.error_code() << "]";
                 set_error_reply(res, status_codes::BadRequest, e);
             }
+#ifdef BST_THREAD_BOOST
             // Boost lock error indicates cannot get lock, perhaps lock limit exceeded
             catch (const boost::lock_error& e)
             {
                 slog::log<slog::severities::error>(gate, SLOG_FLF) << "Boost lock error: " << e.what() << " Perhaps lock limit exceeded";
                 set_error_reply(res, status_codes::ServiceUnavailable, {}, U("Cannot get lock. Perhaps lock limit exceeded"));
             }
+#endif
             // while a runtime_error (often) indicates an unimplemented feature
             catch (const std::runtime_error& e)
             {

Original file line number	Diff line number	Diff line change
`@@ -651,12 +651,14 @@ namespace nmos`
`651`	`651`	`slog::log<slog::severities::warning>(gate, SLOG_FLF) << "HTTP error: " << e.what() << " [" << e.error_code() << "]";`
`652`	`652`	`set_error_reply(res, status_codes::BadRequest, e);`
`653`	`653`	`}`
	`654`	`+#ifdef BST_THREAD_BOOST`
`654`	`655`	`// Boost lock error indicates cannot get lock, perhaps lock limit exceeded`
`655`	`656`	`catch (const boost::lock_error& e)`
`656`	`657`	`{`
`657`	`658`	`slog::log<slog::severities::error>(gate, SLOG_FLF) << "Boost lock error: " << e.what() << " Perhaps lock limit exceeded";`
`658`	`659`	`set_error_reply(res, status_codes::ServiceUnavailable, {}, U("Cannot get lock. Perhaps lock limit exceeded"));`
`659`	`660`	`}`
	`661`	`+#endif`
`660`	`662`	`// while a runtime_error (often) indicates an unimplemented feature`
`661`	`663`	`catch (const std::runtime_error& e)`
`662`	`664`	`{`