Rename FGMarkerBeacon to FGMarkerBeacon record, to avoid a clash with the

instrument of the same name. In the future I'd prefer to rename the
instrument class instead (FGMarkerBeaconReciever?) but this is the safest
change for now.

Thanks (again) to Yon Uriarte for pointing out the problem (which seems to
affect MSVC more than gcc)

diff --git a/src/Navaids/markerbeacon.cxx b/src/Navaids/markerbeacon.cxx
index 9eaeff2cd27dac67395fa29fad514911f94fedbe..71584504f3a312f4fa4ccee1ff47e6b31db3bb27 100644 (file)
--- a/src/Navaids/markerbeacon.cxx
+++ b/src/Navaids/markerbeacon.cxx
@@ -34,7 +34,7 @@
 using std::string;
 
 FGPositioned::Type
-FGMarkerBeacon::mapType(int aTy)
+FGMarkerBeaconRecord::mapType(int aTy)
 {
   switch (aTy) {
   case 7: return FGPositioned::OM;
@@ -42,12 +42,12 @@ FGMarkerBeacon::mapType(int aTy)
   case 9: return FGPositioned::IM;
   default:
     throw sg_range_exception("Got a non-marker-beacon-type", 
-      "FGMarkerBeacon::mapType");
+      "FGMarkerBeaconRecord::mapType");
   }
 }
 
-FGMarkerBeacon*
-FGMarkerBeacon::create(int aTy, const string& aName, const SGGeod& aPos)
+FGMarkerBeaconRecord*
+FGMarkerBeaconRecord::create(int aTy, const string& aName, const SGGeod& aPos)
 {
   Type fgpTy = mapType(aTy);
   FGRunway* runway = getRunwayFromName(aName);
@@ -57,11 +57,11 @@ FGMarkerBeacon::create(int aTy, const string& aName, const SGGeod& aPos)
     pos.setElevationFt(runway->elevation());
   }
   
-  return new FGMarkerBeacon(fgpTy, runway, pos);
+  return new FGMarkerBeaconRecord(fgpTy, runway, pos);
 }
 
 
-FGMarkerBeacon::FGMarkerBeacon(Type aTy, FGRunway* aRunway, const SGGeod& aPos) :
+FGMarkerBeaconRecord::FGMarkerBeaconRecord(Type aTy, FGRunway* aRunway, const SGGeod& aPos) :
   FGPositioned(aTy, string(), aPos),
   _runway(aRunway)
 {

diff --git a/src/Navaids/markerbeacon.hxx b/src/Navaids/markerbeacon.hxx
index 198959c5970a363b29777f3cc4303c9400aaa6c9..c1c458ce4eb5146b24a48d8706045859ded5445e 100644 (file)
--- a/src/Navaids/markerbeacon.hxx
+++ b/src/Navaids/markerbeacon.hxx
@@ -31,13 +31,13 @@
 // forward decls
 class FGRunway;
 
-class FGMarkerBeacon : public FGPositioned
+class FGMarkerBeaconRecord : public FGPositioned
 {
 public:
-  static FGMarkerBeacon* create(int aTy, const std::string& aName, const SGGeod& aPos);
+  static FGMarkerBeaconRecord* create(int aTy, const std::string& aName, const SGGeod& aPos);
 
 private:
-  FGMarkerBeacon(Type aTy, FGRunway* aRunway, const SGGeod& aPos);
+  FGMarkerBeaconRecord(Type aTy, FGRunway* aRunway, const SGGeod& aPos);
   
   FGRunway* _runway; // should this be ref-ptr?
   

diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index 2434171e3a8b64a53e3bc543ae7e84c54f68c3f5..95f7f77eef15f1b72d1e4f32cefc360fa9331230 100644 (file)
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -81,7 +81,7 @@ static FGNavRecord* createNavFromStream(std::istream& aStream)
   
   if ((rawType >= 7) && (rawType <= 9)) {
     // marker beacons use a different run-time class now
-     FGMarkerBeacon::create(rawType, name, pos);
+     FGMarkerBeaconRecord::create(rawType, name, pos);
      return NULL; // not a nav-record, but that's okay
   }