From bab310120e7fe842f7270792fff67fd9a6fbd330 Mon Sep 17 00:00:00 2001 From: lamestllama Date: Wed, 19 Jan 2011 00:02:07 +1030 Subject: [PATCH] patch files for jsbsim --- .../ports/devel/jsbsim/files/patch_FGForce.h | 11 +++++ .../devel/jsbsim/files/patch_FGJSBBase.h | 11 +++++ .../ports/devel/jsbsim/files/patch_FGTank.cpp | 11 +++++ .../ports/devel/jsbsim/files/patch_FGTank.h | 11 +++++ .../devel/jsbsim/files/patch_FGThruster.h | 11 +++++ .../devel/jsbsim/files/patch_easyxml.hxx | 47 +++++++++++++++++++ 6 files changed, 102 insertions(+) create mode 100644 darwin/macports/ports/devel/jsbsim/files/patch_FGForce.h create mode 100644 darwin/macports/ports/devel/jsbsim/files/patch_FGJSBBase.h create mode 100644 darwin/macports/ports/devel/jsbsim/files/patch_FGTank.cpp create mode 100644 darwin/macports/ports/devel/jsbsim/files/patch_FGTank.h create mode 100644 darwin/macports/ports/devel/jsbsim/files/patch_FGThruster.h create mode 100644 darwin/macports/ports/devel/jsbsim/files/patch_easyxml.hxx diff --git a/darwin/macports/ports/devel/jsbsim/files/patch_FGForce.h b/darwin/macports/ports/devel/jsbsim/files/patch_FGForce.h new file mode 100644 index 0000000..2789778 --- /dev/null +++ b/darwin/macports/ports/devel/jsbsim/files/patch_FGForce.h @@ -0,0 +1,11 @@ +--- src/models/propulsion/FGForce.h.orig 2011-01-18 23:50:24.000000000 +1030 ++++ src/models/propulsion/FGForce.h 2011-01-18 23:51:17.000000000 +1030 +@@ -227,7 +227,7 @@ + public: + /// Constructor + FGForce(FGFDMExec *FDMExec); +- FGForce(const FGForce& force) { ++ FGForce(const FGForce& force):FGJSBBase() { + vFn = force.vFn; + vXYZn = force.vXYZn; + ttype = force.ttype; diff --git a/darwin/macports/ports/devel/jsbsim/files/patch_FGJSBBase.h b/darwin/macports/ports/devel/jsbsim/files/patch_FGJSBBase.h new file mode 100644 index 0000000..2d2f1ca --- /dev/null +++ b/darwin/macports/ports/devel/jsbsim/files/patch_FGJSBBase.h @@ -0,0 +1,11 @@ +--- src/FGJSBBase.h.orig 2011-01-18 22:44:42.000000000 +1030 ++++ src/FGJSBBase.h 2011-01-18 22:46:56.000000000 +1030 +@@ -310,7 +310,7 @@ + + static std::queue Messages; + +- void Debug(int) {}; ++ void Debug(int from __attribute__ ((unused))) {}; + + static unsigned int messageId; + diff --git a/darwin/macports/ports/devel/jsbsim/files/patch_FGTank.cpp b/darwin/macports/ports/devel/jsbsim/files/patch_FGTank.cpp new file mode 100644 index 0000000..8986cf7 --- /dev/null +++ b/darwin/macports/ports/devel/jsbsim/files/patch_FGTank.cpp @@ -0,0 +1,11 @@ +--- src/models/propulsion/FGTank.cpp.orig 2011-01-18 22:43:33.000000000 +1030 ++++ src/models/propulsion/FGTank.cpp 2011-01-18 22:44:09.000000000 +1030 +@@ -199,7 +199,7 @@ + + //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +-const double FGTank::GetXYZ(int idx) ++double FGTank::GetXYZ(int idx) + { + return vXYZ_drain(idx) + (Contents/Capacity)*(vXYZ(idx)-vXYZ_drain(idx)); + } diff --git a/darwin/macports/ports/devel/jsbsim/files/patch_FGTank.h b/darwin/macports/ports/devel/jsbsim/files/patch_FGTank.h new file mode 100644 index 0000000..86c766c --- /dev/null +++ b/darwin/macports/ports/devel/jsbsim/files/patch_FGTank.h @@ -0,0 +1,11 @@ +--- src/models/propulsion/FGTank.h.orig 2011-01-18 22:42:20.000000000 +1030 ++++ src/models/propulsion/FGTank.h 2011-01-18 22:43:20.000000000 +1030 +@@ -276,7 +276,7 @@ + void SetDensity(double d) { Density = d; } + + const FGColumnVector3 GetXYZ(void); +- const double GetXYZ(int idx); ++ double GetXYZ(int idx); + + const GrainType GetGrainType(void) {return grainType;} + diff --git a/darwin/macports/ports/devel/jsbsim/files/patch_FGThruster.h b/darwin/macports/ports/devel/jsbsim/files/patch_FGThruster.h new file mode 100644 index 0000000..bf80bcb --- /dev/null +++ b/darwin/macports/ports/devel/jsbsim/files/patch_FGThruster.h @@ -0,0 +1,11 @@ +--- src/models/propulsion/FGThruster.h.orig 2011-01-18 22:41:06.000000000 +1030 ++++ src/models/propulsion/FGThruster.h 2011-01-18 22:41:51.000000000 +1030 +@@ -97,7 +97,7 @@ + return Thrust; + } + void SetName(string name) {Name = name;} +- virtual void SetRPM(double rpm) {}; ++ virtual void SetRPM(double rpm __attribute__ ((unused))) {}; + virtual double GetPowerRequired(void) {return 0.0;} + virtual void SetdeltaT(double dt) {deltaT = dt;} + double GetThrust(void) const {return Thrust;} diff --git a/darwin/macports/ports/devel/jsbsim/files/patch_easyxml.hxx b/darwin/macports/ports/devel/jsbsim/files/patch_easyxml.hxx new file mode 100644 index 0000000..6739605 --- /dev/null +++ b/darwin/macports/ports/devel/jsbsim/files/patch_easyxml.hxx @@ -0,0 +1,47 @@ +--- src/simgear/xml/easyxml.hxx.orig 2011-01-18 22:24:28.000000000 +1030 ++++ src/simgear/xml/easyxml.hxx 2011-01-18 22:38:11.000000000 +1030 +@@ -246,7 +246,7 @@ + * @param atts The element's attributes (not null). + * @see #endElement + */ +- virtual void startElement (const char * name, const XMLAttributes &atts) {} ++ virtual void startElement (const char * name __attribute__ ((unused)), const XMLAttributes &atts __attribute__ ((unused))) {} + + /** Callback for the end of an XML element. + * +@@ -255,7 +255,7 @@ + * @param name The name of the element that is ending (not null). + * @see #startElement + */ +- virtual void endElement (const char * name) {} ++ virtual void endElement (const char * name __attribute__ ((unused))) {} + + /** Callback for a chunk of character data. + * +@@ -270,7 +270,7 @@ + * @param length The number of characters in the chunk (may + * be zero). + */ +- virtual void data (const char * s, int length) {} ++ virtual void data (const char * s __attribute__ ((unused)), int length __attribute__ ((unused))) {} + + /** Callback for an XML processing instruction. + * +@@ -285,7 +285,7 @@ + * @param target The processing instruction target (not null). + * @param data The processing instruction data (not null). + */ +- virtual void pi (const char * target, const char * data) {} ++ virtual void pi (const char * target __attribute__ ((unused)), const char * data __attribute__ ((unused))) {} + + /** Callback for an XML parsing warning. + * +@@ -298,7 +298,7 @@ + * @param column The character position in the line that generated + * the warning. + */ +- virtual void warning (const char * message, int line, int column) {} ++ virtual void warning (const char * message __attribute__ ((unused)), int line __attribute__ ((unused)), int column __attribute__ ((unused))) {} + }; + + /** @relates XMLVisitor