Fix namespace usages in AirLib

Remove `using namespace msr::airlib`
kamanazan · Mar 31, 2022 · c11b19a · c11b19a
1 parent efa1873
commit c11b19a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/AirLib/include/vehicles/multirotor/api/MultirotorApiBase.hpp b/AirLib/include/vehicles/multirotor/api/MultirotorApiBase.hpp
@@ -15,8 +15,6 @@
 #include <thread>
 #include <memory>
 
-using namespace msr::airlib;
-
 namespace msr
 {
 namespace airlib

diff --git a/AirLib/include/vehicles/multirotor/api/MultirotorRpcLibAdaptors.hpp b/AirLib/include/vehicles/multirotor/api/MultirotorRpcLibAdaptors.hpp
@@ -106,7 +106,7 @@ namespace airlib_rpclib
             KinematicsState kinematics_true;
             GeoPoint gps_location;
             uint64_t timestamp;
-            LandedState landed_state;
+            msr::airlib::LandedState landed_state;
             RCData rc_data;
             bool ready;
             std::string ready_message;

diff --git a/...include/vehicles/multirotor/firmwares/simple_flight/firmware/interfaces/CommonStructs.hpp b/...include/vehicles/multirotor/firmwares/simple_flight/firmware/interfaces/CommonStructs.hpp
@@ -101,7 +101,7 @@ class Axis4 : public Axis3<T>
             (*this)[axis] = axis3[axis];
     }
 
-    void setValues(const vector<T>& vals)
+    void setValues(const std::vector<T>& vals)
     {
         (*this)[0] = vals[0];
         (*this)[1] = vals[1];

diff --git a/Examples/main.cpp b/Examples/main.cpp
@@ -92,6 +92,8 @@ void runGaussianMarkovTest()
 
 void runDepthNavGT()
 {
+    using namespace msr::airlib;
+
     typedef ImageCaptureBase::ImageRequest ImageRequest;
     typedef ImageCaptureBase::ImageType ImageType;
 
@@ -122,6 +124,8 @@ void runDepthNavGT()
 
 void runDepthNavSGM()
 {
+    using namespace msr::airlib;
+
     typedef ImageCaptureBase::ImageRequest ImageRequest;
     typedef ImageCaptureBase::ImageType ImageType;
 

diff --git a/Unity/AirLibWrapper/AirsimWrapper/Source/Vehicles/Multirotor/MultirotorPawnSimApi.h b/Unity/AirLibWrapper/AirsimWrapper/Source/Vehicles/Multirotor/MultirotorPawnSimApi.h
@@ -51,7 +51,7 @@ class MultirotorPawnSimApi : public PawnSimApi
     } pending_pose_status_;
 
     //show info on collision response from physics engine
-    CollisionResponse collision_response;
+    msr::airlib::CollisionResponse collision_response;
 
     //when pose needs to set from non-physics thread, we set it as pending
     bool pending_pose_collisions_;
@@ -64,4 +64,4 @@ class MultirotorPawnSimApi : public PawnSimApi
     std::packaged_task<void()> reset_task_;
     Pose last_phys_pose_; //for trace lines showing vehicle path
     std::vector<std::string> vehicle_api_messages_;
-};
+};