Somewhere along the line in the recent changes some std::cout were
inclueded in some of the files. Irix doesn't have cout in the std class, so I changed it to "cout" and included SG_USING_NAMESPACE(std) at the beginning of the files. And some minor warning cleanups.
This commit is contained in:
parent
586d7f127a
commit
a2acc953ae
4 changed files with 9 additions and 5 deletions
|
@ -44,8 +44,8 @@ CLASS DECLARATION
|
||||||
#define DEFAULT_AGL_ALT 3.758099
|
#define DEFAULT_AGL_ALT 3.758099
|
||||||
#define DEFAULT_PITCH_ON_GROUND 0.0074002
|
#define DEFAULT_PITCH_ON_GROUND 0.0074002
|
||||||
|
|
||||||
typedef enum lsspeedset { lssetvt, lssetvc, lssetve, lssetmach, lssetuvw, lssetned };
|
enum lsspeedset { lssetvt, lssetvc, lssetve, lssetmach, lssetuvw, lssetned };
|
||||||
typedef enum lsaltset { lssetasl, lssetagl };
|
enum lsaltset { lssetasl, lssetagl };
|
||||||
|
|
||||||
|
|
||||||
class LaRCsimIC {
|
class LaRCsimIC {
|
||||||
|
|
|
@ -57,6 +57,7 @@
|
||||||
|
|
||||||
#include "globals.hxx"
|
#include "globals.hxx"
|
||||||
|
|
||||||
|
SG_USING_NAMESPACE(std);
|
||||||
SG_USING_STD(string);
|
SG_USING_STD(string);
|
||||||
|
|
||||||
|
|
||||||
|
@ -90,7 +91,7 @@ static FGProtocol *parse_port_config( const string& config )
|
||||||
FGATC610x *atc610x = new FGATC610x;
|
FGATC610x *atc610x = new FGATC610x;
|
||||||
io = atc610x;
|
io = atc610x;
|
||||||
short_circuit = true;
|
short_circuit = true;
|
||||||
std::cout << "here ..." << endl;
|
cout << "here ..." << endl;
|
||||||
} else if ( protocol == "atlas" ) {
|
} else if ( protocol == "atlas" ) {
|
||||||
FGAtlas *atlas = new FGAtlas;
|
FGAtlas *atlas = new FGAtlas;
|
||||||
io = atlas;
|
io = atlas;
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
|
|
||||||
#include "garmin.hxx"
|
#include "garmin.hxx"
|
||||||
|
|
||||||
|
SG_USING_NAMESPACE(std);
|
||||||
|
|
||||||
FGGarmin::FGGarmin() {
|
FGGarmin::FGGarmin() {
|
||||||
}
|
}
|
||||||
|
@ -145,7 +146,7 @@ bool FGGarmin::gen_message() {
|
||||||
garmin_sentence += rmz_sum;
|
garmin_sentence += rmz_sum;
|
||||||
garmin_sentence += "\n";
|
garmin_sentence += "\n";
|
||||||
|
|
||||||
std::cout << garmin_sentence;
|
cout << garmin_sentence;
|
||||||
|
|
||||||
length = garmin_sentence.length();
|
length = garmin_sentence.length();
|
||||||
strncpy( buf, garmin_sentence.c_str(), length );
|
strncpy( buf, garmin_sentence.c_str(), length );
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
|
|
||||||
#include "nmea.hxx"
|
#include "nmea.hxx"
|
||||||
|
|
||||||
|
SG_USING_NAMESPACE(std);
|
||||||
|
|
||||||
|
|
||||||
FGNMEA::FGNMEA() {
|
FGNMEA::FGNMEA() {
|
||||||
}
|
}
|
||||||
|
@ -145,7 +147,7 @@ bool FGNMEA::gen_message() {
|
||||||
nmea_sentence += gga_sum;
|
nmea_sentence += gga_sum;
|
||||||
nmea_sentence += "\n";
|
nmea_sentence += "\n";
|
||||||
|
|
||||||
std::cout << nmea_sentence;
|
cout << nmea_sentence;
|
||||||
|
|
||||||
length = nmea_sentence.length();
|
length = nmea_sentence.length();
|
||||||
strncpy( buf, nmea_sentence.c_str(), length );
|
strncpy( buf, nmea_sentence.c_str(), length );
|
||||||
|
|
Loading…
Add table
Reference in a new issue