Skip to content

Commit 03104a3

Browse files
committed
de-inline modelregistration ctor
1 parent 89bfa8b commit 03104a3

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

src/viam/sdk/registry/registry.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,25 @@ ResourceServerRegistration::ResourceServerRegistration(
6262
ResourceServerRegistration::~ResourceServerRegistration() = default;
6363
ResourceClientRegistration::~ResourceClientRegistration() = default;
6464

65+
ModelRegistration::ModelRegistration(
66+
API api,
67+
Model model,
68+
std::function<std::shared_ptr<Resource>(Dependencies, ResourceConfig)> constructor)
69+
: construct_resource(std::move(constructor)),
70+
validate(default_validator),
71+
model_(std::move(model)),
72+
api_(std::move(api)) {}
73+
74+
ModelRegistration::ModelRegistration(
75+
API api,
76+
Model model,
77+
std::function<std::shared_ptr<Resource>(Dependencies, ResourceConfig)> constructor,
78+
std::function<std::vector<std::string>(ResourceConfig)> validator)
79+
: construct_resource(std::move(constructor)),
80+
validate(std::move(validator)),
81+
model_(std::move(model)),
82+
api_(std::move(api)) {}
83+
6584
const API& ModelRegistration::api() const {
6685
return api_;
6786
};

src/viam/sdk/registry/registry.hpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,13 @@ class ModelRegistration {
7272
ModelRegistration(
7373
API api,
7474
Model model,
75-
std::function<std::shared_ptr<Resource>(Dependencies, ResourceConfig)> constructor)
76-
: construct_resource(std::move(constructor)),
77-
validate(default_validator),
78-
model_(std::move(model)),
79-
api_(std::move(api)) {};
75+
std::function<std::shared_ptr<Resource>(Dependencies, ResourceConfig)> constructor);
8076

8177
ModelRegistration(
8278
API api,
8379
Model model,
8480
std::function<std::shared_ptr<Resource>(Dependencies, ResourceConfig)> constructor,
85-
std::function<std::vector<std::string>(ResourceConfig)> validator)
86-
: construct_resource(std::move(constructor)),
87-
validate(std::move(validator)),
88-
model_(std::move(model)),
89-
api_(std::move(api)) {};
81+
std::function<std::vector<std::string>(ResourceConfig)> validator);
9082

9183
const API& api() const;
9284
const Model& model() const;

0 commit comments

Comments
 (0)