fly/flightgear
1
0
Fork 0
Code Activity

Fix build with Clang 4.0.0.

Browse source 
Those patches fix errors related to ordered comparisons between pointers and
integers, such as the ones related here on FreeBSD :

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216203
This commit is contained in:
martymac 2017-01-21 21:32:50 +00:00
parent 40b6ca14e8
commit ffc7ad6cdf
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/JSBSim/FGFDMExec.cpp
View file

@ -211,7 +211,7 @@ FGFDMExec::~FGFDMExec()
SetGroundCallback(0); SetGroundCallback(0);
if (FDMctr > 0) (*FDMctr)--; if (FDMctr != 0) (*FDMctr)--;
Debug(1); Debug(1);
} }

2
src/FDM/JSBSim/input_output/FGInputSocket.cpp
View file

@ -192,7 +192,7 @@ void FGInputSocket::Read(bool Holding)
} else { } else {
socket->Reply("Must be in HOLD to search properties\n"); socket->Reply("Must be in HOLD to search properties\n");
} }
} else if (node > 0) { } else {
ostringstream buf; ostringstream buf;
buf << argument << " = " << setw(12) << setprecision(6) << node->getDoubleValue() << endl; buf << argument << " = " << setw(12) << setprecision(6) << node->getDoubleValue() << endl;
socket->Reply(buf.str()); socket->Reply(buf.str());

6
src/Network/native_ctrls.cxx
View file

@ -428,9 +428,9 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_freezes,
// node->setDoubleValue( net->brake_right ); // node->setDoubleValue( net->brake_right );
node = fgGetNode( "/controls/switches", true ); node = fgGetNode( "/controls/switches", true );
node->setBoolValue( "master-bat", net->master_bat > 0 ); node->setBoolValue( "master-bat", net->master_bat != 0 );
node->setBoolValue( "master-alt", net->master_alt > 0); node->setBoolValue( "master-alt", net->master_alt != 0 );
node->setBoolValue( "master-avionics", net->master_avionics > 0); node->setBoolValue( "master-avionics", net->master_avionics > 0 );
node = fgGetNode( "/environment", true ); node = fgGetNode( "/environment", true );
node->setDoubleValue( "wind-speed-kt", net->wind_speed_kt ); node->setDoubleValue( "wind-speed-kt", net->wind_speed_kt );