Avoid "using..." in header files.

diff --git a/src/Input/FGEventInput.cxx b/src/Input/FGEventInput.cxx
index 1717cfa1df24d74429eb843f7b64c18dcbb650a7..058775193ce62ac391adb4e9b0fec5a85c1a0146 100644 (file)
--- a/src/Input/FGEventInput.cxx
+++ b/src/Input/FGEventInput.cxx
@@ -34,6 +34,7 @@
 using simgear::PropertyList;
 using std::cout;
 using std::endl;
+using std::map;
 
 FGEventSetting::FGEventSetting( SGPropertyNode_ptr base ) :
   value(0.0)

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index eca5d59c48a500e87f87999f6c03cb7a26d9a713..af0a4491f33e9d9e7128d2b9af9b37395d80029e 100644 (file)
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -34,9 +34,10 @@
 #include <Navaids/navlist.hxx>
 #include <Navaids/procedure.hxx>
 
-
 #include "NasalSys.hxx"
 
+using std::map;
+
 static FGNasalSys* nasalSys = 0;
 
 // Listener class for loading Nasal modules on demand

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index c8367f41b5c05fad03d37eebaea0057a61a5d474..b564bb354d8d711975ceab5a7a40a4d589ac4704 100644 (file)
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -10,7 +10,6 @@
 #include <simgear/threads/SGQueue.hxx>
 
 #include <map>
-using std::map;
 
 
 class FGNasalScript;
@@ -139,7 +138,7 @@ private:
     };
 
     // Listener
-    map<int, FGNasalListener *> _listener;
+    std::map<int, FGNasalListener *> _listener;
     vector<FGNasalListener *> _dead_listener;
     static int _listenerId;