Skip to content

Commit e45bafc

Browse files
committed
update method name to avoid conflict
1 parent 587d1f6 commit e45bafc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/viam/sdk/config/resource.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const std::string& ResourceConfig::type() const {
8383
return type_;
8484
}
8585

86-
log_level ResourceConfig::log_level() const {
86+
log_level ResourceConfig::get_log_level() const {
8787
return log_level_;
8888
}
8989

@@ -143,7 +143,7 @@ void to_proto_impl<ResourceConfig>::operator()(const ResourceConfig& self,
143143
*proto->mutable_namespace_() = self.namespace_();
144144
*proto->mutable_type() = self.type();
145145
*proto->mutable_api() = self.api().to_string();
146-
*proto->mutable_log_configuration()->mutable_level() = to_string(self.log_level());
146+
*proto->mutable_log_configuration()->mutable_level() = to_string(self.get_log_level());
147147
*proto->mutable_model() = self.model().to_string();
148148
*proto->mutable_attributes() = to_proto(self.attributes());
149149

src/viam/sdk/config/resource.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class ResourceConfig {
6363
const std::string& namespace_() const;
6464
const std::string& type() const;
6565

66-
log_level log_level() const;
66+
log_level get_log_level() const;
6767

6868
const std::vector<std::string>& depends_on() const;
6969

src/viam/sdk/module/service.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct ModuleService::ServiceImpl : viam::module::v1::ModuleService::Service {
6060
if (reg) {
6161
try {
6262
res = reg->construct_resource(deps, cfg);
63-
res->set_log_level(cfg.log_level());
63+
res->set_log_level(cfg.get_log_level());
6464
} catch (const std::exception& exc) {
6565
return grpc::Status(::grpc::INTERNAL, exc.what());
6666
}
@@ -99,7 +99,7 @@ struct ModuleService::ServiceImpl : viam::module::v1::ModuleService::Service {
9999
}
100100
try {
101101
Reconfigurable::reconfigure_if_reconfigurable(res, deps, cfg);
102-
res->set_log_level(cfg.log_level());
102+
res->set_log_level(cfg.get_log_level());
103103
return grpc::Status();
104104
} catch (const std::exception& exc) {
105105
return grpc::Status(::grpc::INTERNAL, exc.what());

0 commit comments

Comments
 (0)