fly/flightgear
1
0
Fork 0
Code Activity

Avoid an 'overloaded-virtual' warning.

Browse source 
Clang reports an overloaded-virtual in FGGeneric (and it's correct). Rename the overload to avoid both the warning and confusion.
This commit is contained in:
James Turner 2012-09-18 00:59:36 +01:00
parent 505796e349
commit 39307d335c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Network/generic.cxx
View file

@ -390,7 +390,7 @@ bool FGGeneric::parse_message_ascii(int length) {
return true; return true;
} }
bool FGGeneric::parse_message(int length) { bool FGGeneric::parse_message_len(int length) {
if (binary_mode) { if (binary_mode) {
return parse_message_binary(length); return parse_message_binary(length);
} else { } else {
@ -448,7 +448,7 @@ bool FGGeneric::process() {
if (!binary_mode) { if (!binary_mode) {
length = io->readline( buf, FG_MAX_MSG_SIZE ); length = io->readline( buf, FG_MAX_MSG_SIZE );
if ( length > 0 ) { if ( length > 0 ) {
parse_message( length ); parse_message_len( length );
} else { } else {
SG_LOG( SG_IO, SG_ALERT, "Error reading data." ); SG_LOG( SG_IO, SG_ALERT, "Error reading data." );
return false; return false;
@ -456,7 +456,7 @@ bool FGGeneric::process() {
} else { } else {
length = io->read( buf, binary_record_length ); length = io->read( buf, binary_record_length );
if ( length == binary_record_length ) { if ( length == binary_record_length ) {
parse_message( length ); parse_message_len( length );
} else { } else {
SG_LOG( SG_IO, SG_ALERT, SG_LOG( SG_IO, SG_ALERT,
"Generic protocol: Received binary " "Generic protocol: Received binary "
@ -468,12 +468,12 @@ bool FGGeneric::process() {
} else { } else {
if (!binary_mode) { if (!binary_mode) {
while ((length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) { while ((length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) {
parse_message( length ); parse_message_len( length );
} }
} else { } else {
while ((length = io->read( buf, binary_record_length )) while ((length = io->read( buf, binary_record_length ))
== binary_record_length ) { == binary_record_length ) {
parse_message( length ); parse_message_len( length );
} }
if ( length > 0 ) { if ( length > 0 ) {

2
src/Network/generic.hxx
View file

@ -42,7 +42,7 @@ public:
~FGGeneric(); ~FGGeneric();
bool gen_message(); bool gen_message();
bool parse_message(int length); bool parse_message_len(int length);
// open hailing frequencies // open hailing frequencies
bool open(); bool open();