From 9c90709872d7aa0bbd957891534336e8b1397f87 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Mon, 2 May 2016 07:56:56 +1000
Subject: [PATCH] SITL: fixed namespace of SITL classes

---
 libraries/SITL/SIM_Frame.h       | 3 ++-
 libraries/SITL/SIM_Motor.h       | 3 ++-
 libraries/SITL/SIM_Multicopter.h | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/SITL/SIM_Frame.h b/libraries/SITL/SIM_Frame.h
index 7d8bfff435..6e2d0f1cff 100644
--- a/libraries/SITL/SIM_Frame.h
+++ b/libraries/SITL/SIM_Frame.h
@@ -22,7 +22,7 @@
 #include "SIM_Aircraft.h"
 #include "SIM_Motor.h"
 
-using namespace SITL;
+namespace SITL {
 
 /*
   class to describe a multicopter frame type
@@ -58,3 +58,4 @@ public:
     float mass;
     uint8_t motor_offset;
 };
+}
diff --git a/libraries/SITL/SIM_Motor.h b/libraries/SITL/SIM_Motor.h
index 8171d47bd4..46a956e45e 100644
--- a/libraries/SITL/SIM_Motor.h
+++ b/libraries/SITL/SIM_Motor.h
@@ -21,7 +21,7 @@
 
 #include "SIM_Aircraft.h"
 
-using namespace SITL;
+namespace SITL {
 
 /*
   class to describe a motor position
@@ -70,3 +70,4 @@ public:
                           Vector3f &rot_accel, // rad/sec
                           Vector3f &body_thrust) const; // Z is down
 };
+}
diff --git a/libraries/SITL/SIM_Multicopter.h b/libraries/SITL/SIM_Multicopter.h
index 7cbaf9ff57..a24dc59e71 100644
--- a/libraries/SITL/SIM_Multicopter.h
+++ b/libraries/SITL/SIM_Multicopter.h
@@ -23,7 +23,7 @@
 #include "SIM_Motor.h"
 #include "SIM_Frame.h"
 
-using namespace SITL;
+namespace SITL {
 
 /*
   a multicopter simulator
@@ -46,3 +46,4 @@ protected:
     Frame *frame;
 };
 
+}