]>
Commit | Line | Data |
---|---|---|
d0841e28 JB |
1 | "reserved" is protoc keyword now. |
2 | ||
3 | --- PokerTH-1.1.1-src/pokerth.proto.orig 2014-01-10 22:18:20.743643130 +0100 | |
4 | +++ PokerTH-1.1.1-src/pokerth.proto 2017-12-12 20:56:47.300267594 +0100 | |
5 | @@ -701,7 +701,7 @@ | |
6 | ||
7 | message ErrorMessage { | |
8 | enum ErrorReason { | |
9 | - reserved = 0; | |
10 | + reserved_ = 0; | |
11 | initVersionNotSupported = 1; | |
12 | initServerFull = 2; | |
13 | initAuthFailure = 3; | |
14 | --- PokerTH-1.1.1-src/src/net/common/netpacket.cpp.orig 2014-01-10 22:18:20.917643110 +0100 | |
15 | +++ PokerTH-1.1.1-src/src/net/common/netpacket.cpp 2017-12-12 21:02:41.138399391 +0100 | |
16 | @@ -249,7 +249,7 @@ | |
17 | retVal = ErrorMessage::sessionTimeout; | |
18 | break; | |
19 | default : | |
20 | - retVal = ErrorMessage::reserved; | |
21 | + retVal = ErrorMessage::reserved_; | |
22 | break; | |
23 | } | |
24 | return retVal; |