Merge remote-tracking branch 'origin/integration' into integration

This commit is contained in:
J. Nick Koston
2025-06-29 08:20:36 -05:00

View File

@@ -149,8 +149,8 @@ class APIServer : public Component, public Controller {
#ifdef USE_API_YAML_SERVICES #ifdef USE_API_YAML_SERVICES
return this->user_services_; return this->user_services_;
#else #else
static const std::vector<UserServiceDescriptor *> empty; static const std::vector<UserServiceDescriptor *> EMPTY;
return this->user_services_ ? *this->user_services_ : empty; return this->user_services_ ? *this->user_services_ : EMPTY;
#endif #endif
} }