[Jsbsim-devel] CVS: JSBSim FGColumnVector3.h,1.12,1.13 FGColumnVector4.h,1.10,1.11 FGConfigFile.h,1.36,1.37 FGMatrix33.h,1.9,1.10 FGTank.h,1.21,1.22 FGfdmSocket.h,1.24,1.25

[David M. <dme...@us...>]

Update of /cvsroot/jsbsim/JSBSim
In directory sc8-pr-cvs1:/tmp/cvs-serv25801

Modified Files:
	FGColumnVector3.h FGColumnVector4.h FGConfigFile.h 
	FGMatrix33.h FGTank.h FGfdmSocket.h 
Log Message:
Patches from Erik Hofman for SGI compatibility:

Some more cmall changes to the SimGear header files and removed the 
SG_HAVE_NATIVE_SGI_COMPILERS dependancies from FlightGear.

I've added a seperate JSBSim patch for the JSBSim source tree.


Index: FGColumnVector3.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/FGColumnVector3.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** FGColumnVector3.h	10 Dec 2001 23:34:58 -0000	1.12
--- FGColumnVector3.h	31 Dec 2002 18:01:58 -0000	1.13
***************
*** 27,37 ****
  #  include STL_IOSTREAM
     SG_USING_STD(string);
! #  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
!      SG_USING_STD(ostream);
!      SG_USING_STD(istream);
!      SG_USING_STD(cerr);
!      SG_USING_STD(cout);
!      SG_USING_STD(endl);
! #  endif
  #else
  #  include <string>
--- 27,35 ----
  #  include STL_IOSTREAM
     SG_USING_STD(string);
!    SG_USING_STD(ostream);
!    SG_USING_STD(istream);
!    SG_USING_STD(cerr);
!    SG_USING_STD(cout);
!    SG_USING_STD(endl);
  #else
  #  include <string>

Index: FGColumnVector4.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/FGColumnVector4.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** FGColumnVector4.h	10 Dec 2001 23:34:58 -0000	1.10
--- FGColumnVector4.h	31 Dec 2002 18:01:59 -0000	1.11
***************
*** 27,37 ****
  #  include STL_IOSTREAM
     SG_USING_STD(string);
! #  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
!      SG_USING_STD(ostream);
!      SG_USING_STD(istream);
!      SG_USING_STD(cerr);
!      SG_USING_STD(cout);
!      SG_USING_STD(endl);
! #  endif
  #else
  #  include <string>
--- 27,35 ----
  #  include STL_IOSTREAM
     SG_USING_STD(string);
!    SG_USING_STD(ostream);
!    SG_USING_STD(istream);
!    SG_USING_STD(cerr);
!    SG_USING_STD(cout);
!    SG_USING_STD(endl);
  #else
  #  include <string>

Index: FGConfigFile.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/FGConfigFile.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** FGConfigFile.h	23 Sep 2002 11:52:50 -0000	1.36
--- FGConfigFile.h	31 Dec 2002 18:01:59 -0000	1.37
***************
*** 45,57 ****
  #  include STL_IOSTREAM
     SG_USING_STD(string);
! #  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
!      SG_USING_STD(ostream);
!      SG_USING_STD(istream);
!      SG_USING_STD(ifstream);
!      SG_USING_STD(cerr);
!      SG_USING_STD(endl);
!      SG_USING_STD(ios);
!      SG_USING_STD(cout);
! #  endif
  #else
  #  include <string>
--- 45,55 ----
  #  include STL_IOSTREAM
     SG_USING_STD(string);
!    SG_USING_STD(ostream);
!    SG_USING_STD(istream);
!    SG_USING_STD(ifstream);
!    SG_USING_STD(cerr);
!    SG_USING_STD(endl);
!    SG_USING_STD(ios);
!    SG_USING_STD(cout);
  #else
  #  include <string>

Index: FGMatrix33.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/FGMatrix33.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** FGMatrix33.h	10 Dec 2001 23:34:58 -0000	1.9
--- FGMatrix33.h	31 Dec 2002 18:01:59 -0000	1.10
***************
*** 29,39 ****
  #  include STL_IOSTREAM
     SG_USING_STD(string);
! #  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
!      SG_USING_STD(ostream);
!      SG_USING_STD(istream);
!      SG_USING_STD(cerr);
!      SG_USING_STD(cout);
!      SG_USING_STD(endl);
! #  endif
  #else
  #  include <string>
--- 29,37 ----
  #  include STL_IOSTREAM
     SG_USING_STD(string);
!    SG_USING_STD(ostream);
!    SG_USING_STD(istream);
!    SG_USING_STD(cerr);
!    SG_USING_STD(cout);
!    SG_USING_STD(endl);
  #else
  #  include <string>

Index: FGTank.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/FGTank.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** FGTank.h	19 Jan 2002 03:01:59 -0000	1.21
--- FGTank.h	31 Dec 2002 18:01:59 -0000	1.22
***************
*** 52,60 ****
  #  include STL_STRING
    SG_USING_STD(string);
! # if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
!    SG_USING_STD(cerr);
!    SG_USING_STD(endl);
!    SG_USING_STD(cout);
! # endif
  #else
  # include <string>
--- 52,58 ----
  #  include STL_STRING
    SG_USING_STD(string);
!   SG_USING_STD(cerr);
!   SG_USING_STD(endl);
!   SG_USING_STD(cout);
  #else
  # include <string>

Index: FGfdmSocket.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/FGfdmSocket.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** FGfdmSocket.h	4 Feb 2002 23:05:34 -0000	1.24
--- FGfdmSocket.h	31 Dec 2002 18:01:59 -0000	1.25
***************
*** 50,57 ****
  #  include STL_IOSTREAM
  #  include STL_FSTREAM
! #  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
!      SG_USING_STD(cout);
!      SG_USING_STD(endl);
! #  endif
  #else
  #  include <string>
--- 50,55 ----
  #  include STL_IOSTREAM
  #  include STL_FSTREAM
!    SG_USING_STD(cout);
!    SG_USING_STD(endl);
  #else
  #  include <string>