fly/flightgear
1
0
Fork 0
Code Activity

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

Browse source 
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)
This commit is contained in:
jmt 2009-01-04 20:12:43 +00:00 • committed by Tim Moore
parent 63d224081e
commit e171f0ecdb
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Navaids/markerbeacon.cxx
View file

@ -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)
{

6
src/Navaids/markerbeacon.hxx
View file

@ -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?

2
src/Navaids/navdb.cxx
View file

@ -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
}