JSBsim as today in CVS doesn't compile with MSVC 7. Classes FGTurboJet,
FGTurboProp, FGTurboShaft are not in the JSBsim namespace. I don't know
if it is intended. If yes, there is a need for a 'using namespace JSBSim;'
directive. In addition, the map in FGSwitch doesn't compile with const,
that is totally useless in that case.

A patch follow

Cheers,

-Fred

D:\FlightGear\cvs\FlightGear\src\FDM\JSBSim>cvs -z3 -q diff -u
Index: FGTurboJet.h
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/FDM/JSBSim/FGTurboJet.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 FGTurboJet.h
--- FGTurboJet.h        10 Sep 2002 01:14:00 -0000      1.1.1.1
+++ FGTurboJet.h        27 Jan 2003 20:25:22 -0000
@@ -51,6 +51,8 @@
 CLASS DECLARATION

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%*/

+using namespace JSBSim;
+
 class FGTurboJet : public FGEngine
 {
 public:
Index: FGTurboProp.h
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/FDM/JSBSim/FGTurboProp.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 FGTurboProp.h
--- FGTurboProp.h       10 Sep 2002 01:14:00 -0000      1.1.1.1
+++ FGTurboProp.h       27 Jan 2003 20:25:22 -0000
@@ -51,6 +51,8 @@
 CLASS DECLARATION

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%*/

+using namespace JSBSim;
+
 class FGTurboProp : public FGEngine
 {
 public:
Index: FGTurboShaft.h
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/FDM/JSBSim/FGTurboShaft.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 FGTurboShaft.h
--- FGTurboShaft.h      10 Sep 2002 01:14:00 -0000      1.1.1.1
+++ FGTurboShaft.h      27 Jan 2003 20:25:22 -0000
@@ -47,6 +47,8 @@

 #define ID_TURBOSHAFT "$Id: FGTurboShaft.h,v 1.1.1.1 2002/09/10 01:14:00
curt Exp $"

+using namespace JSBSim;
+

/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%
 CLASS DECLARATION

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%*/
Index: filtersjb/FGSwitch.h
===================================================================
RCS file:
/var/cvs/FlightGear-0.9/FlightGear/src/FDM/JSBSim/filtersjb/FGSwitch.h,v
retrieving revision 1.2
diff -u -r1.2 FGSwitch.h
--- filtersjb/FGSwitch.h        24 Jan 2003 12:55:31 -0000      1.2
+++ filtersjb/FGSwitch.h        27 Jan 2003 20:25:22 -0000
@@ -119,7 +119,7 @@

   enum eLogic {elUndef=0, eAND, eOR, eDefault};
   enum eComparison {ecUndef=0, eEQ, eNE, eGT, eGE, eLT, eLE};
-  map <const string, eComparison> mComparison;
+  map <string, eComparison> mComparison;

   struct test {
     vector <FGCondition> conditions;



_______________________________________________
Flightgear-devel mailing list
[EMAIL PROTECTED]
http://mail.flightgear.org/mailman/listinfo/flightgear-devel

Reply via email to