Skip to content

Commit d9ba0a3

Browse files
authored
Merge pull request Blizzard#271 from richardapowell/fix_some_compile_warnings
Fix some compile warnings.
2 parents 647008a + c40bc0c commit d9ba0a3

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

include/sc2api/sc2_client.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ enum class ClientError {
4343
//! A set of common events a user can override in their derived bot or replay observer class.
4444
class ClientEvents {
4545
public:
46+
virtual ~ClientEvents() {}
47+
4648
//! Called when a game is started after a load. Fast restarting will not call this.
4749
virtual void OnGameFullStart() {}
4850

include/sc2utils/sc2_simple_serialization.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <fstream>
88
#include <iostream>
99
#include <set>
10+
#include <typeinfo>
1011

1112
namespace sc2 {
1213

src/sc2api/sc2_connection.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ static void ConnectionClosedHandler(const struct mg_connection* conn, void *) {
9292
}
9393

9494
Connection::Connection() :
95-
verbose_(false),
9695
connection_(nullptr),
96+
verbose_(false),
9797
queue_(),
9898
mutex_(),
9999
condition_(),

src/sc2api/sc2_data.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ void AbilityData::ReadFromProto(const SC2APIProtocol::AbilityData& ability_data)
8888
target = Target::PointOrNone;
8989
break;
9090
}
91-
case SC2APIProtocol::AbilityData_Target_None: {
92-
}
91+
case SC2APIProtocol::AbilityData_Target_None:
9392
default: {
9493
target = Target::None;
9594
break;
@@ -159,8 +158,7 @@ std::string AbilityData::Log() const {
159158
str_out += " Target: Point or unit\n";
160159
break;
161160
}
162-
case Target::None: {
163-
}
161+
case Target::None:
164162
default: {
165163
str_out += " Target: None\n";
166164
break;

src/sc2api/sc2_server.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static void SendMessage(mg_connection* conn, std::queue<T>& message_queue) {
8686

8787
google::protobuf::Message* message = message_queue.front().second;
8888
size_t size = message->ByteSize();
89-
void* bytes = new char[size];
89+
char* bytes = new char[size];
9090
message->SerializeToArray(bytes, (int)size);
9191
mg_websocket_write(
9292
conn,
@@ -95,7 +95,7 @@ static void SendMessage(mg_connection* conn, std::queue<T>& message_queue) {
9595
size
9696
);
9797
message_queue.pop();
98-
delete bytes;
98+
delete [] bytes;
9999
delete message;
100100
}
101101

0 commit comments

Comments
 (0)