[RSDK-10385] Eliminate wrapper struct for VS2019 compat

Author: acmorrow

src/viam/sdk/services/motion.cpp

@@ -22,10 +22,6 @@ bool operator==(const obstacle_detector& lhs, const obstacle_detector& rhs) {
     return lhs.vision_service == rhs.vision_service && lhs.camera == rhs.camera;
 }
 
-bool operator==(const Motion::steps& lhs, const Motion::steps& rhs) {
-    return lhs.steps == rhs.steps;
-}
-
 bool operator==(const Motion::plan_status& lhs, const Motion::plan_status& rhs) {
     return std::tie(lhs.reason, lhs.state, lhs.timestamp) ==
            std::tie(rhs.reason, rhs.state, rhs.timestamp);

src/viam/sdk/services/motion.hpp

@@ -113,19 +113,13 @@ class Motion : public Service {
         friend bool operator==(const plan_status_with_id& lhs, const plan_status_with_id& rhs);
     };
 
-    /// @struct steps
+    /// @brief An individual "step", representing the state each component (keyed as a fully
+    /// qualified component name) should reach while executing that step of the plan.
+    using step = std::unordered_map<std::string, pose>;
+
     /// @brief An ordered list of plan steps.
     /// @ingroup Motion
-    struct steps {
-        /// @brief An individual "step", representing the state each component (keyed as a fully
-        /// qualified component name) should reach while executing that step of the plan.
-        typedef std::unordered_map<std::string, pose> step;
-
-        /// @brief The ordered list of steps.
-        std::vector<step> steps;
-
-        friend bool operator==(const struct steps& lhs, const struct steps& rhs);
-    };
+    using steps = std::vector<step>;
 
     /// @struct plan
     /// @brief Describes a motion plan.
@@ -142,7 +136,7 @@ class Motion : public Service {
         std::string execution_id;
 
         /// @brief An ordered list of plan steps.
-        struct steps steps;
+        steps steps;
 
         friend bool operator==(const plan& lhs, const plan& rhs);
     };

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

@@ -139,17 +139,16 @@ Motion::plan_status_with_id from_proto(const service::motion::v1::PlanStatusWith
 
 Motion::steps steps_from_proto(
     const google::protobuf::RepeatedPtrField<service::motion::v1::PlanStep>& proto) {
-    using step = Motion::steps::step;
-    std::vector<step> steps;
+    Motion::steps steps;
     for (const auto& ps : proto) {
-        step step;
+        Motion::step step;
         for (const auto& component : ps.step()) {
             step.emplace(component.first, from_proto(component.second.pose()));
         }
         steps.push_back(std::move(step));
     }
 
-    return {steps};
+    return steps;
 }
 
 Motion::plan plan_from_proto(const service::motion::v1::Plan& proto) {

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

@@ -51,7 +51,7 @@ service::motion::v1::PlanStatus to_proto(const Motion::plan_status& ps) {
     return proto;
 }
 
-service::motion::v1::PlanStep to_proto(const Motion::steps::step& step) {
+service::motion::v1::PlanStep to_proto(const Motion::step& step) {
     service::motion::v1::PlanStep proto;
     for (const auto& kv : step) {
         service::motion::v1::ComponentState cs;
@@ -67,7 +67,7 @@ service::motion::v1::Plan to_proto(const Motion::plan& plan) {
     *proto.mutable_id() = plan.id;
     *proto.mutable_component_name() = to_proto(plan.component_name);
     *proto.mutable_execution_id() = plan.execution_id;
-    for (const auto& step : plan.steps.steps) {
+    for (const auto& step : plan.steps) {
         *proto.mutable_steps()->Add() = to_proto(step);
     }