← Back to team overview

widelands-dev team mailing list archive

Re: [Merge] lp:~widelands-dev/widelands/gcc531 into lp:widelands

 

Replied to the comments.

Diff comments:

> === modified file 'src/logic/queue_cmd_factory.cc'
> --- src/logic/queue_cmd_factory.cc	2016-01-18 05:12:51 +0000
> +++ src/logic/queue_cmd_factory.cc	2016-05-01 10:05:57 +0000
> @@ -112,7 +112,7 @@
>  	case QueueCommandTypes::kReplaySyncRead:
>  	case QueueCommandTypes::kReplayEnd:
>  	case QueueCommandTypes::kNone:
> -		throw wexception("Unknown Queue_Cmd_Id in file: %u", id);
> +		throw wexception("Unknown Queue_Cmd_Id in file: %u", static_cast<unsigned int>(id));
>  	}

The Travis clang builds are clean here - could you give me the text of the warning, please?

>  	NEVER_HERE();
>  }
> 
> === modified file 'src/map_io/map_players_view_packet.cc'
> --- src/map_io/map_players_view_packet.cc	2016-02-16 10:27:23 +0000
> +++ src/map_io/map_players_view_packet.cc	2016-05-01 10:05:57 +0000
> @@ -991,12 +991,12 @@
>  						}
>  
>  						//  edges
> -						if (!bl_seen & (f_everseen | bl_everseen))
> +						if (!(bl_seen) & (f_everseen | bl_everseen))
>  							roads_file.unsigned_8(f_player_field.road_sw());
> -						if (!br_seen & (f_everseen | br_everseen))
> +						if (!(br_seen) & (f_everseen | br_everseen))
>  							roads_file.unsigned_8(f_player_field.road_se());
> -						if (!r_seen & (f_everseen |  r_everseen))
> -							roads_file.unsigned_8(f_player_field.road_e ());
> +						if (!(r_seen) & (f_everseen | r_everseen))
> +							roads_file.unsigned_8(f_player_field.road_e());

That's a false positive from our own codecheck rules - I have to see about fixing that.

Changing bitwise operators to non-bitwise operators will completely change the semantics of the function - don't change it.

http://www.cprogramming.com/tutorial/bitwise_operators.html

>  					}
>  
>  					//  geologic survey


-- 
https://code.launchpad.net/~widelands-dev/widelands/gcc531/+merge/293478
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/gcc531.


References