Skip to content

Commit 6abfbfb

Browse files
author
Jesper Torp Kristensen
committed
Fix remaining warning and add -Werror and -Wextra
1 parent 29b05fb commit 6abfbfb

19 files changed

+64
-72
lines changed

‎src/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CXX = g++
22

3-
CFLAGS = -O3 -arch x86_64 -Wall -pedantic -ansi -DNDEBUG
4-
CFLAGS_DB = -ggdb3 -pg -Wall -pedantic -ansi
3+
CFLAGS = -O3 -arch x86_64 -Wall -pedantic -ansi -Werror -Wextra -DNDEBUG
4+
CFLAGS_DB = -ggdb3 -pg -Wall -pedantic -ansi -Werror -Wextra
55
CFLAGS_XB = -O3 -Wall -pedantic -ansi -DNDEBUG -DXBOARD
66
CFLAGS_DB_XB = -ggdb3 -pg -Wall -pedantic -ansi -DXBOARD
77

‎src/board_2_plus_help_classes.hxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public:
107107
return piece_position[piece_number];
108108
}
109109

110-
void insert_piece(Position pos, Piece piece) {
110+
void insert_piece(Position pos, __attribute__((unused)) Piece piece) {
111111
assert(piece_number[pos] == 42);
112112
piece_number[pos] = pop_piece_number();
113113
piece_position[piece_number[pos]] = pos;
@@ -130,7 +130,7 @@ public:
130130
}
131131

132132
// mapping[old_piece_number] |-> new_piece_number
133-
void remap_pieces(uint8_t *mapping) {
133+
void remap_pieces(__attribute__((unused)) uint8_t *mapping) {
134134
// todo
135135
}
136136
private:
@@ -261,7 +261,7 @@ public:
261261
}
262262

263263
// mapping[old_piece_number] |-> new_piece_number
264-
void remap_pieces(uint8_t *mapping) {
264+
void remap_pieces(__attribute__((unused)) uint8_t *mapping) {
265265
// todo
266266
}
267267
private:

‎src/chess.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ PGNLoader pgn_loader;
2727

2828
void receive_messages();
2929

30-
int main(int argc, char* argv[]) {
30+
int main(__attribute__((unused)) int argc, __attribute__((unused)) char* argv[]) {
3131
run_endian_test();
3232
endgames.init();
3333
init_opening_library();
@@ -92,7 +92,7 @@ void show_minimal_alpha_beta_tree_sizes(ostream &os, int n, int to_depth) {
9292
}
9393

9494

95-
// To do: fjern erklæringerne herfra
95+
// To do: fjern erkl�ringerne herfra
9696

9797
bool debug_message(string message);
9898

@@ -561,7 +561,7 @@ void receive_messages() {
561561

562562
#define print_help(com) cerr << " " << #com << " or " << short_version(#com) << "\n"
563563

564-
bool debug_message(string message) {
564+
bool debug_message(__attribute__((unused)) string message) {
565565
if (dot_demand(p, 1, "help")) {
566566
cerr << "Overview of commands: (must be typed EXACT)\n"
567567
<< " help or h\n"

‎src/compression/endgame_clustering_functions.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#endif
1313

1414
#ifdef ALLOW_5_MEN_ENDGAME
15-
#define FIFTH_PARAM , int _5
15+
#define FIFTH_PARAM , __attribute__((unused)) int _5
1616
#else
1717
#define FIFTH_PARAM
1818
#endif
@@ -52,14 +52,14 @@ inline uint8_t dist(Position p1, Position p2) {
5252

5353

5454
#define num_values_KRK (1 + 3 + 7)
55-
int KRK_subset_number(int rook, int _FK_, int _BK_, int ignored FIFTH_PARAM) {
55+
int KRK_subset_number(__attribute__((unused)) int rook, int _FK_, int _BK_, __attribute__((unused)) int ignored FIFTH_PARAM) {
5656
_BK_ = INV_REMAP_BOUND_KING[_BK_];
5757

5858
return CORNER_DIST[bk] + dist(wk, bk);
5959
}
6060

6161
#define num_values_KBBK (1 + 2*3 + 7)
62-
int KBBK_subset_number(int bishop1, int bishop2, int _FK_, int _BK_ FIFTH_PARAM) {
62+
int KBBK_subset_number(__attribute__((unused)) int bishop1, __attribute__((unused)) int bishop2, int _FK_, int _BK_ FIFTH_PARAM) {
6363
_BK_ = INV_REMAP_BOUND_KING[_BK_];
6464
/*
6565
cerr << "KBBK_subset_number(" << POS_NAME[wk] << "," << POS_NAME[bishop1]
@@ -71,21 +71,21 @@ int KBBK_subset_number(int bishop1, int bishop2, int _FK_, int _BK_ FIFTH_PARAM)
7171

7272

7373
#define num_values_KBNK (1 + 2*3 + 7)
74-
int KBNK_subset_number(int knight, int bishop, int _FK_, int _BK_ FIFTH_PARAM) {
74+
int KBNK_subset_number(__attribute__((unused)) int knight, int bishop, int _FK_, int _BK_ FIFTH_PARAM) {
7575
_BK_ = INV_REMAP_BOUND_KING[_BK_];
7676
return 2*CORNER_DIST[bishop] + dist(wk, bk);
7777
}
7878

7979

8080
#define num_values_KRKB (1 + 4*7 + 2*3 + 7)
81-
int KRKB_subset_number(int bishop, int rook, int _FK_, int _BK_ FIFTH_PARAM) {
81+
int KRKB_subset_number(int bishop, __attribute__((unused)) int rook, int _FK_, int _BK_ FIFTH_PARAM) {
8282
_BK_ = INV_REMAP_BOUND_KING[_BK_];
8383
return 13 + 4*dist(bk, bishop) - 2*EDGE_DIST[bk] - dist(wk, bk);
8484
}
8585

8686

8787
#define num_values_KQKR (1 + 3 + 3 + 7 + 7)
88-
int KQKR_subset_number(int brook, int wqueen, int _FK_, int _BK_ FIFTH_PARAM) {
88+
int KQKR_subset_number(int brook, __attribute__((unused)) int wqueen, int _FK_, int _BK_ FIFTH_PARAM) {
8989
_BK_ = INV_REMAP_BOUND_KING[_BK_];
9090

9191
return EDGE_DIST[bk] + CORNER_DIST[bk] + dist(bk,wk) + (7 - dist(bk, brook));

‎src/compression/endgame_table_bdd.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ void BDD::init_no_clustering(uint8_t *bdd_table, int log_bdd_size,
373373
}
374374

375375

376-
void BDD::use_king_pos_as_subsets(uint8_t *bdd_table, int log_bdd_size) {
376+
void BDD::use_king_pos_as_subsets(__attribute__((unused)) uint8_t *bdd_table, int log_bdd_size) {
377377
assert(!clustering_kind);
378378
create_clustering_kind_1();
379379

@@ -474,7 +474,7 @@ struct SplitHelp {
474474
};
475475

476476

477-
void BDD::init(uint8_t *bdd_table, int log_bdd_size, const uint8_t inv_bit_perm[5][64],
477+
void BDD::init(uint8_t *bdd_table, int log_bdd_size, __attribute__((unused)) const uint8_t inv_bit_perm[5][64], // TODO: Unused ???
478478
bool do_preprocessing, bool calc_sifting, bool do_mapping_after_sifting) {
479479
assert(clustering_kind);
480480
do_mapping_after_sifting &= do_preprocessing & calc_sifting;

‎src/compression/run_length_encoding/PredictionModel.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ using namespace std;
1313
template <class TYPE, class ElementStreamer = DefaultElementStreamer<TYPE> >
1414
class PredictionModel {
1515
public:
16-
virtual void nextElement(TYPE element) {}
16+
virtual void nextElement(__attribute__((unused)) TYPE element) {}
1717

1818
virtual vector<pair<TYPE, float> > & getDistribution() = 0;
1919

‎src/compression/run_length_encoding/PredictionModel_templ.hxx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
template <class TYPE, class ElementStreamer>
2-
ZerothOrderModel<TYPE, ElementStreamer>::ZerothOrderModel(string filename) :
2+
ZerothOrderModel<TYPE, ElementStreamer>::ZerothOrderModel(__attribute__((unused)) string filename) :
33
count(0), distribution_initialized(false)
44
{
5-
65
assert(0); // I don't want to fix this code now.
76

87
/*

‎src/compression/run_length_encoding/bit_stream.hxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static const int unary_length_specifier[7] =
3232
// file input bit stream
3333
class file_ibstream {
3434
public:
35-
file_ibstream(uint8_t *data) {
35+
file_ibstream(__attribute__((unused)) uint8_t *data) {
3636
cerr << "Can't initialize file_ibstream(uint8_t *data)\n"; exit(1);
3737
}
3838
file_ibstream(string filename) : file(filename.c_str()), bitsleft(8) {
@@ -58,7 +58,7 @@ private:
5858
// array input bit stream
5959
class array_ibstream {
6060
public:
61-
array_ibstream(string filename) {
61+
array_ibstream(__attribute__((unused)) string filename) {
6262
assert(0); cout << "Can't initialize array_ibstream(string filename)\n"; exit(1);
6363
}
6464
array_ibstream(uint8_t *data) : data(data), bitsleft(8) {}
@@ -109,7 +109,7 @@ public:
109109
// file output bit stream
110110
class file_obstream {
111111
public:
112-
file_obstream(uint8_t *data) {
112+
file_obstream(__attribute__((unused)) uint8_t *data) {
113113
assert(0); cerr << "Can't initialize file_obstream(uint8_t *data)\n"; exit(1);
114114
}
115115
file_obstream(string filename) : file(filename.c_str()), bitsleft(8), ch(0) {
@@ -169,13 +169,13 @@ private:
169169
// array output bit stream
170170
class array_obstream {
171171
public:
172-
array_obstream(string filename) {
172+
array_obstream(__attribute__((unused)) string filename) {
173173
cout << "Can't initialize array_obstream(string filename)\n"; exit(1);
174174
}
175175
array_obstream(uint8_t *data) : data(data), bitsleft(8) {}
176176

177177
// always_flush ignored
178-
void close(bool always_flush = false) {
178+
void close(__attribute__((unused)) bool always_flush = false) {
179179
if (bitsleft!=8) {
180180
bits_written_since_mark += bitsleft;
181181
*data <<= bitsleft;
@@ -285,7 +285,7 @@ public:
285285
return string(tmp, 2*sizeof(TYPE) + 2);
286286
}
287287

288-
int bit_size(TYPE &elem) { return 8*sizeof(TYPE); }
288+
int bit_size(__attribute__((unused)) TYPE &elem) { return 8*sizeof(TYPE); }
289289

290290
// Used for huff tree reduction
291291
int average_bit_size() { return 8*sizeof(TYPE); }
@@ -325,7 +325,7 @@ public:
325325
}
326326
}
327327

328-
const int average_bit_size() {
328+
int average_bit_size() const {
329329
return 12;// More or less arbitrary
330330
}
331331

@@ -353,7 +353,7 @@ public:
353353
static const string TF[2] = {"F","T"};
354354
return TF[element];
355355
}
356-
int bit_size(bool &elem) { return 1; }
356+
int bit_size(__attribute__((unused)) bool &elem) { return 1; }
357357
int average_bit_size() { return 1; }
358358
bool operator()(const bool &e1, const bool &e2) const { return e1<e2; }
359359
};

‎src/engine/cpu_communication_module.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void* CPU_CommunicationModule::operator new(size_t size) {
2727
return get_shared_mem(size);
2828
}
2929

30-
void CPU_CommunicationModule::operator delete(void *p, size_t size) {
30+
void CPU_CommunicationModule::operator delete(__attribute__((unused)) void *p, __attribute__((unused)) size_t size) {
3131
cerr << "Calling CPU_CommunicationModule::operator delete.\n";
3232
}
3333

@@ -86,6 +86,6 @@ void* MessageQueue::operator new(size_t size) {
8686
return get_shared_mem(size);
8787
}
8888

89-
void MessageQueue::operator delete(void *p, size_t size) {
89+
void MessageQueue::operator delete(__attribute__((unused)) void *p, __attribute__((unused)) size_t size) {
9090
cerr << "Calling MessageQueue::operator delete.\n";
9191
}

‎src/engine/cpu_engines.hxx‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,14 @@ template<> class Gah<string>;
2424

2525
Engine *load_cpu(Engine *cpu, int search_version, int evaluation_version, CPU_CommunicationModule *comm);
2626

27-
#define EvalSearch(Eval, Search) class Eval_ ## Eval ## _Search_ ## Search : \
28-
public Eval_ ## Eval , public Search_ ## Search {\
29-
public:\
30-
Eval_ ## Eval ## _Search_ ## Search (CPU_CommunicationModule *comm) :\
31-
Engine(comm) {}\
32-
}
33-
34-
EvalSearch(1,1);
35-
EvalSearch(1,2);
36-
EvalSearch(1,3);
37-
EvalSearch(2,1);
38-
EvalSearch(2,2);
39-
EvalSearch(2,3);
40-
EvalSearch(3,1);
41-
EvalSearch(3,2);
42-
EvalSearch(3,3);
27+
class Eval_1_Search_1 : public Eval_1, public Search_1 { public: Eval_1_Search_1(CPU_CommunicationModule *comm): Engine(comm) {}};
28+
class Eval_1_Search_2 : public Eval_1, public Search_2 { public: Eval_1_Search_2(CPU_CommunicationModule *comm): Engine(comm) {}};
29+
class Eval_1_Search_3 : public Eval_1, public Search_3 { public: Eval_1_Search_3(CPU_CommunicationModule *comm): Engine(comm), Search_3(comm) {}};
30+
class Eval_2_Search_1 : public Eval_2, public Search_1 { public: Eval_2_Search_1(CPU_CommunicationModule *comm): Engine(comm) {}};
31+
class Eval_2_Search_2 : public Eval_2, public Search_2 { public: Eval_2_Search_2(CPU_CommunicationModule *comm): Engine(comm) {}};
32+
class Eval_2_Search_3 : public Eval_2, public Search_3 { public: Eval_2_Search_3(CPU_CommunicationModule *comm): Engine(comm), Search_3(comm) {}};
33+
class Eval_3_Search_1 : public Eval_3, public Search_1 { public: Eval_3_Search_1(CPU_CommunicationModule *comm): Engine(comm), Eval_3(comm) {}};
34+
class Eval_3_Search_2 : public Eval_3, public Search_2 { public: Eval_3_Search_2(CPU_CommunicationModule *comm): Engine(comm), Eval_3(comm) {}};
35+
class Eval_3_Search_3 : public Eval_3, public Search_3 { public: Eval_3_Search_3(CPU_CommunicationModule *comm): Engine(comm), Eval_3(comm), Search_3(comm) {}};
4336

4437
#endif

0 commit comments

Comments
 (0)