Skip to content

Commit 2f470be

Browse files
committed
lint
1 parent d36b9ea commit 2f470be

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

src/viam/sdk/common/proto_utils.hpp

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ void vecToRepeatedPtr(const std::vector<Src>& vec, google::protobuf::RepeatedPtr
1919
}
2020
}
2121

22-
/// @brief Non-member to_proto() version. (necessary for moving generated types out of wrapper headers).
23-
/// Template param F is a function that converts from Src to Dst.
22+
/// @brief Non-member to_proto() version. (necessary for moving generated types out of wrapper
23+
/// headers). Template param F is a function that converts from Src to Dst.
2424
template <typename Src, typename Dst>
25-
void vecToRepeatedPtr(const std::vector<Src>& vec, google::protobuf::RepeatedPtrField<Dst>& dest, Dst& from_proto(const Src&)) {
25+
void vecToRepeatedPtr(const std::vector<Src>& vec,
26+
google::protobuf::RepeatedPtrField<Dst>& dest,
27+
Dst& from_proto(const Src&)) {
2628
dest.Reserve(vec.size());
2729
for (auto& x : vec) {
2830
*dest.Add() = from_proto(x);
@@ -39,10 +41,12 @@ void repeatedPtrToVec(const google::protobuf::RepeatedPtrField<Src>& src, std::v
3941
}
4042
}
4143

42-
/// @brief Non-member to_proto() version. (necessary for moving generated types out of wrapper headers).
43-
/// Template param F is a function that converts from Src to Dst.
44+
/// @brief Non-member to_proto() version. (necessary for moving generated types out of wrapper
45+
/// headers). Template param F is a function that converts from Src to Dst.
4446
template <typename Src, typename Dst>
45-
void repeatedPtrToVec(const google::protobuf::RepeatedPtrField<Src>& src, std::vector<Dst>& vec, Dst& to_proto(const Src&)) {
47+
void repeatedPtrToVec(const google::protobuf::RepeatedPtrField<Src>& src,
48+
std::vector<Dst>& vec,
49+
Dst& to_proto(const Src&)) {
4650
vec.reserve(src.size());
4751
for (auto& x : src) {
4852
vec.push_back(to_proto(x));

src/viam/sdk/common/utils.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,11 @@ void set_logger_severity_from_args(int argc, char** argv);
9999
/// @param extra The extra ProtoStruct.
100100
bool from_dm_from_extra(const ProtoStruct& extra);
101101

102-
template <typename Src, typename Dst> Dst auto_from_proto(const Src& proto);
102+
template <typename Src, typename Dst>
103+
Dst auto_from_proto(const Src& proto);
103104

104-
template <typename Src, typename Dst> Dst auto_to_proto(const Src& wrapped);
105+
template <typename Src, typename Dst>
106+
Dst auto_to_proto(const Src& wrapped);
105107

106108
} // namespace sdk
107109
} // namespace viam

src/viam/sdk/services/navigation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#include <viam/sdk/services/navigation.hpp>
22

3-
#include <viam/sdk/common/utils.hpp>
43
#include <viam/sdk/common/proto_utils.hpp>
4+
#include <viam/sdk/common/utils.hpp>
55

66
namespace viam {
77
namespace sdk {
88

9-
Navigation::Navigation(std::string name) : Service(std::move(name)) {};
9+
Navigation::Navigation(std::string name) : Service(std::move(name)){};
1010

1111
API Navigation::api() const {
1212
return API::get<Navigation>();

src/viam/sdk/services/private/navigation_client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#include <viam/api/service/navigation/v1/navigation.pb.h>
99

1010
#include <viam/sdk/common/client_helper.hpp>
11+
#include <viam/sdk/common/proto_utils.hpp>
1112
#include <viam/sdk/common/proto_value.hpp>
1213
#include <viam/sdk/common/utils.hpp>
13-
#include <viam/sdk/common/proto_utils.hpp>
1414
#include <viam/sdk/services/navigation.hpp>
1515

1616
namespace viam {

src/viam/sdk/services/private/navigation_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#include <grpcpp/support/status.h>
44

55
#include <viam/sdk/common/pose.hpp>
6+
#include <viam/sdk/common/proto_utils.hpp>
67
#include <viam/sdk/common/proto_value.hpp>
78
#include <viam/sdk/common/service_helper.hpp>
89
#include <viam/sdk/common/utils.hpp>
9-
#include <viam/sdk/common/proto_utils.hpp>
1010
#include <viam/sdk/services/motion.hpp>
1111
#include <viam/sdk/services/private/navigation_server.hpp>
1212
#include <viam/sdk/spatialmath/geometry.hpp>

0 commit comments

Comments
 (0)