mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
32 lines
1 KiB
Diff
32 lines
1 KiB
Diff
|
Fix type comparison issue that is a hard error in GCC 10.
|
||
|
|
|
||
|
|
Taken from upstream:
|
||
|
|
|
||
|
|
https://github.com/OpenTTD/grfcodec/commit/bb692b2c723c5e87cc8f89f445928e97594d5b8f
|
||
|
|
|
||
|
|
diff --git a/src/command.cpp b/src/command.cpp
|
||
|
|
index 9aa0e14..1f32cf1 100644
|
||
|
|
--- a/src/command.cpp
|
||
|
|
+++ b/src/command.cpp
|
||
|
|
@@ -300,8 +300,9 @@ bool parse_comment(const string&line){
|
||
|
|
break;
|
||
|
|
case BEAUTIFY:{
|
||
|
|
commandstream>>command_part;
|
||
|
|
- uint val=find_command(command_part,beaut),togglebit;
|
||
|
|
- if(val!=(uint)-1&&val!=OFF)_commandState.beautifier=true;
|
||
|
|
+ int val=find_command(command_part,beaut);
|
||
|
|
+ uint togglebit;
|
||
|
|
+ if(val!=-1&&val!=OFF)_commandState.beautifier=true;
|
||
|
|
switch(val){
|
||
|
|
case -1:
|
||
|
|
IssueMessage(0,COMMAND_INVALID_ARG,gen[BEAUTIFY].name);
|
||
|
|
@@ -372,7 +373,7 @@ bool parse_comment(const string&line){
|
||
|
|
dotoggle:
|
||
|
|
commandstream>>command_part;
|
||
|
|
val=find_command(command_part,beaut);
|
||
|
|
- if(!commandstream||val==(uint)-1){
|
||
|
|
+ if(!commandstream||val==-1){
|
||
|
|
IssueMessage(0,COMMAND_INVALID_ARG,gen[BEAUTIFY].name);
|
||
|
|
return true;
|
||
|
|
}
|