CVS: source/src/Autopilot xmlauto.cxx, 1.56, 1.57 xmlauto.hxx, 1.33, 1.34

Tim Moore <[email protected]> Mon, 19 Apr 2010 05:34:39 -0500
Newsgroups gmane.games.flightgear.cvc
Message-ID <[email protected]>
Update of /var/cvs/FlightGear-0.9/source/src/Autopilot
In directory baron.flightgear.org:/tmp/cvs-serv6308/src/Autopilot

Modified Files:
	xmlauto.cxx xmlauto.hxx 
Log Message:
Move using declaration out of header file


Author: Tim Moore <[email protected]>


Index: xmlauto.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Autopilot/xmlauto.cxx,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xmlauto.cxx	15 Apr 2010 12:31:12 -0000	1.56
+++ xmlauto.cxx	19 Apr 2010 10:34:24 -0000	1.57
@@ -40,6 +40,8 @@
 using std::cout;
 using std::endl;
 
+using simgear::PropertyList;
+
 FGPeriodicalValue::FGPeriodicalValue( SGPropertyNode_ptr root )
 {
   SGPropertyNode_ptr minNode = root->getChild( "min" );

Index: xmlauto.hxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Autopilot/xmlauto.hxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xmlauto.hxx	15 Apr 2010 12:31:14 -0000	1.33
+++ xmlauto.hxx	19 Apr 2010 10:34:26 -0000	1.34
@@ -49,8 +49,6 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/props/condition.hxx>
 
-using simgear::PropertyList;
-
 typedef SGSharedPtr<class FGXMLAutoInput> FGXMLAutoInput_ptr;
 typedef SGSharedPtr<class FGPeriodicalValue> FGPeriodicalValue_ptr;
 
@@ -124,7 +122,7 @@
 class FGXMLAutoComponent : public SGReferenced {
 
 private:
-    PropertyList output_list;
+    simgear::PropertyList output_list;
 
     SGSharedPtr<const SGCondition> _condition;
     SGPropertyNode_ptr enable_prop;
@@ -203,7 +201,8 @@
         // helpful for things like flight directors which position
         // their vbars from the autopilot computations.
         if ( honor_passive && passive_mode->getBoolValue() ) return;
-        for( PropertyList::iterator it = output_list.begin(); it != output_list.end(); ++it)
+        for( simgear::PropertyList::iterator it = output_list.begin();
+             it != output_list.end(); ++it)
           (*it)->setDoubleValue( clamp( value ) );
     }
 
@@ -214,7 +213,8 @@
         // helpful for things like flight directors which position
         // their vbars from the autopilot computations.
         if ( honor_passive && passive_mode->getBoolValue() ) return;
-        for( PropertyList::iterator it = output_list.begin(); it != output_list.end(); ++it)
+        for( simgear::PropertyList::iterator it = output_list.begin();
+             it != output_list.end(); ++it)
           (*it)->setBoolValue( value ); // don't use clamp here, bool is clamped anyway
     }
 


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev