jsbsim-cvslogs

[Bertrand <bco...@us...>]

Update of /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22568

Modified Files:
	Controls.cpp Thruster.cpp 
Log Message:
For some reason, MSVC++ requires to specify explicitly the typename of the min/max functions.

Index: Controls.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Controls.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** Controls.cpp	5 Jun 2016 20:00:14 -0000	1.39
--- Controls.cpp	11 Jun 2016 10:02:09 -0000	1.40
***************
*** 233,237 ****
  
          float CLmin = CL0 + MIN_ALPHA*CLalpha;
!         float CLmax = CL0 + std::max(alpha,MAX_ALPHA)*CLalpha;
  
          _aircraft->_CYp.at(i) = -CL*CYp_const;
--- 233,237 ----
  
          float CLmin = CL0 + MIN_ALPHA*CLalpha;
!         float CLmax = CL0 + std::max<float>(alpha,MAX_ALPHA)*CLalpha;
  
          _aircraft->_CYp.at(i) = -CL*CYp_const;

Index: Thruster.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Thruster.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** Thruster.cpp	3 May 2016 11:51:19 -0000	1.25
--- Thruster.cpp	11 Jun 2016 10:02:09 -0000	1.26
***************
*** 221,225 ****
                      float alpha = th-phi;
  
!                     float CL = std::min(std::max(CL0 + alpha*CLa, -1.42f), 1.42f);
                      float CD = CD0 + alpha*CDa*CL + CDi*CL*CL;
                      float CY = CL*cphi - CD*sphi;
--- 221,225 ----
                      float alpha = th-phi;
  
!                     float CL = std::min<float>(std::max<float>(CL0 + alpha*CLa, -1.42f), 1.42f);
                      float CD = CD0 + alpha*CDa*CL + CDi*CL*CL;
                      float CY = CL*cphi - CD*sphi;