[Jsbsim-cvslogs] CVS: JSBSim/src/math/direct_search DirectSearch.h, 1.1, 1.2 SimplexSearch.h, 1.1, 1.2 cppmat.h, 1.1, 1.2 objective.h, 1.1, 1.2 vec.h, 1.1, 1.2

[Erik H. <eh...@us...>]

Update of /cvsroot/jsbsim/JSBSim/src/math/direct_search
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3122/math/direct_search

Modified Files:
	DirectSearch.h SimplexSearch.h cppmat.h objective.h vec.h 
Log Message:
Fix some IRIX/MIPSpro specific header problems

Index: DirectSearch.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/math/direct_search/DirectSearch.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DirectSearch.h	2 Sep 2007 03:51:55 -0000	1.1
--- DirectSearch.h	15 Sep 2007 09:04:18 -0000	1.2
***************
*** 6,11 ****
  //#include <istream>
  #include <sstream>
! #include <cmath>
! #include <cstdlib>
  #include <math/direct_search/objective.h>  // user's file
  #include <math/direct_search/vec.h>        // vector and matrix classes
--- 6,16 ----
  //#include <istream>
  #include <sstream>
! #if defined(sgi) && !defined(__GNUC__)
! # include <math.h>
! # include <stdlib.h>
! #else
! # include <cmath>
! # include <cstdlib>
! #endif
  #include <math/direct_search/objective.h>  // user's file
  #include <math/direct_search/vec.h>        // vector and matrix classes

Index: SimplexSearch.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/math/direct_search/SimplexSearch.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SimplexSearch.h	2 Sep 2007 03:51:56 -0000	1.1
--- SimplexSearch.h	15 Sep 2007 09:04:18 -0000	1.2
***************
*** 11,16 ****
  #include <iostream>
  #include <fstream>
! #include <cmath>
! #include <cstdlib>
  #include <math/direct_search/objective.h>
  #include <math/direct_search/vec.h>
--- 11,21 ----
  #include <iostream>
  #include <fstream>
! #if defined(sgi) && !defined(__GNUC__)
! # include <math.h>
! # include <stdlib.h>
! #else
! # include <cmath>
! # include <cstdlib>
! #endif
  #include <math/direct_search/objective.h>
  #include <math/direct_search/vec.h>

Index: cppmat.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/math/direct_search/cppmat.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** cppmat.h	2 Sep 2007 03:51:56 -0000	1.1
--- cppmat.h	15 Sep 2007 09:04:18 -0000	1.2
***************
*** 84,89 ****
  
  #include <math/direct_search/vec.h>
! #include <cstdlib>
! #include <cassert>
  
  #include <iostream>
--- 84,94 ----
  
  #include <math/direct_search/vec.h>
! #if defined(sgi) && !defined(__GNUC__)
! # include <stdlib.h>
! # include <assert.h>
! #else
! # include <cstdlib>
! # include <cassert>
! #endif
  
  #include <iostream>

Index: objective.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/math/direct_search/objective.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** objective.h	2 Sep 2007 03:51:56 -0000	1.1
--- objective.h	15 Sep 2007 09:04:18 -0000	1.2
***************
*** 12,16 ****
  
  #include <math/direct_search/vec.h>
! #include <cmath>
  #include <iostream>
  
--- 12,20 ----
  
  #include <math/direct_search/vec.h>
! #if defined(sgi) && !defined(__GNUC__)
! # include <math.h>
! #else
! # include <cmath>
! #endif
  #include <iostream>
  

Index: vec.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/math/direct_search/vec.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** vec.h	2 Sep 2007 03:51:56 -0000	1.1
--- vec.h	15 Sep 2007 09:04:18 -0000	1.2
***************
*** 52,58 ****
  
  //#include "subscrpt.h"
! #include <cmath> /*for l2norms*/
! #include <cstdlib>
! #include <cassert>
  #include <iostream>
  #include <sstream>
--- 52,64 ----
  
  //#include "subscrpt.h"
! #if defined(sgi) && !defined(__GNUC__)
! # include <math.h>
! # include <stdlib.h>
! # include <assert.h>
! #else
! # include <cmath> /*for l2norms*/
! # include <cstdlib>
! # include <cassert>
! #endif
  #include <iostream>
  #include <sstream>