Merge branch 'jt/runway' into next

[flightgear.git] / src / Main / viewmgr.hxx

diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx
index 321f6a2e157ac88943eb3d5d40b62b8231b65508..ea4470fbb6a93bbd0dd78d416b611b3fcb83166c 100644 (file)
--- a/src/Main/viewmgr.hxx
+++ b/src/Main/viewmgr.hxx
@@ -36,7 +36,7 @@
 #include "fg_props.hxx"
 #include "viewer.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 // Define a structure containing view information
@@ -150,8 +150,9 @@ private:
 
     SGPropertyNode_ptr view_number;
     vector<SGPropertyNode_ptr> config_list;
-    typedef vector<FGViewer *> viewer_list;
+    typedef vector<SGSharedPtr<FGViewer> > viewer_list;
     viewer_list views;
+    SGVec3d abs_viewer_position;
 
     int current;