de-inline modelregistration ctor

viamrobotics · Dec 18, 2024 · 03104a3 · 03104a3
1 parent 89bfa8b
commit 03104a3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/src/viam/sdk/registry/registry.cpp b/src/viam/sdk/registry/registry.cpp
@@ -62,6 +62,25 @@ ResourceServerRegistration::ResourceServerRegistration(
 ResourceServerRegistration::~ResourceServerRegistration() = default;
 ResourceClientRegistration::~ResourceClientRegistration() = default;
 
+ModelRegistration::ModelRegistration(
+    API api,
+    Model model,
+    std::function<std::shared_ptr<Resource>(Dependencies, ResourceConfig)> constructor)
+    : construct_resource(std::move(constructor)),
+      validate(default_validator),
+      model_(std::move(model)),
+      api_(std::move(api)) {}
+
+ModelRegistration::ModelRegistration(
+    API api,
+    Model model,
+    std::function<std::shared_ptr<Resource>(Dependencies, ResourceConfig)> constructor,
+    std::function<std::vector<std::string>(ResourceConfig)> validator)
+    : construct_resource(std::move(constructor)),
+      validate(std::move(validator)),
+      model_(std::move(model)),
+      api_(std::move(api)) {}
+
 const API& ModelRegistration::api() const {
     return api_;
 };

diff --git a/src/viam/sdk/registry/registry.hpp b/src/viam/sdk/registry/registry.hpp
@@ -72,21 +72,13 @@ class ModelRegistration {
     ModelRegistration(
         API api,
         Model model,
-        std::function<std::shared_ptr<Resource>(Dependencies, ResourceConfig)> constructor)
-        : construct_resource(std::move(constructor)),
-          validate(default_validator),
-          model_(std::move(model)),
-          api_(std::move(api)) {};
+        std::function<std::shared_ptr<Resource>(Dependencies, ResourceConfig)> constructor);
 
     ModelRegistration(
         API api,
         Model model,
         std::function<std::shared_ptr<Resource>(Dependencies, ResourceConfig)> constructor,
-        std::function<std::vector<std::string>(ResourceConfig)> validator)
-        : construct_resource(std::move(constructor)),
-          validate(std::move(validator)),
-          model_(std::move(model)),
-          api_(std::move(api)) {};
+        std::function<std::vector<std::string>(ResourceConfig)> validator);
 
     const API& api() const;
     const Model& model() const;