Merge branch 'next' into attenuation

[flightgear.git] / src / Instrumentation / wxradar.hxx

diff --git a/src/Instrumentation/wxradar.hxx b/src/Instrumentation/wxradar.hxx
index 2b696430a7f8baf65d5f59ec8d8df3c5f3585dd1..639302bdc61ea94bb55dd06ec44ecd45e23658f9 100644 (file)
--- a/src/Instrumentation/wxradar.hxx
+++ b/src/Instrumentation/wxradar.hxx
@@ -51,7 +51,7 @@ public:
     virtual void valueChanged(SGPropertyNode *);
 
 protected:
-    string _name;
+    std::string _name;
     int _num;
     double _time;
     double _interval;
@@ -90,7 +90,7 @@ protected:
     SGPropertyNode *getInstrumentNode(const char *name, DefaultType value);
 
 private:
-    string _texture_path;
+    std::string _texture_path;
 
     typedef enum { ARC, MAP, PLAN, ROSE, BSCAN} DisplayMode;
     DisplayMode _display_mode;