fix windows build breaks (missing return value on the new getActorPos…

…e() method) and a warning as error on one unused parameter.
sushil-bharati · Dec 7, 2017 · bc44e8f · bc44e8f
1 parent b29c2aa
commit bc44e8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/AirLib/include/vehicles/multirotor/controllers/RealMultirotorConnector.hpp b/AirLib/include/vehicles/multirotor/controllers/RealMultirotorConnector.hpp
@@ -80,6 +80,7 @@ class RealMultirotorConnector : public VehicleConnectorBase
     virtual Pose getActorPose(const std::string& actor_name) override
     {
         unused(actor_name);
+        return msr::airlib::Pose();
     }
 
 

diff --git a/AirLib/src/api/RpcLibClientBase.cpp b/AirLib/src/api/RpcLibClientBase.cpp
@@ -157,6 +157,7 @@ CollisionInfo RpcLibClientBase::getCollisionInfo()
 
 msr::airlib::Pose RpcLibClientBase::simGetObjectPose(const std::string& object_name)
 {
+    unused(object_name);
     return pimpl_->client.call("simGetObjectPose").as<RpcLibAdapatorsBase::Pose>().to();
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,7 @@ class RealMultirotorConnector : public VehicleConnectorBase @@
         virtual Pose getActorPose(const std::string& actor_name) override
         {
             unused(actor_name);
+            return msr::airlib::Pose();
         }
@@ Expand Down @@