Skip to content

Commit aaf33e1

Browse files
Tony Ricciardijhunsaker
authored andcommitted
Fix clang build failures under -Werror:
- Make hidden overloaded virtual functions explicit, with private 'using base::method'. - Change 'virtual' to 'override' in overridden methods. - Remove unused private member variables.
1 parent b505d92 commit aaf33e1

File tree

4 files changed

+23
-7
lines changed

4 files changed

+23
-7
lines changed

pc/manager.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ namespace pc
5555
public:
5656

5757
manager();
58-
virtual ~manager();
58+
~manager() override;
5959

6060
// solana rpc http connection
6161
void set_rpc_host( const std::string& );
@@ -151,7 +151,7 @@ namespace pc
151151
void poll( bool do_wait = true);
152152

153153
// accept new pyth client apps
154-
void accept( int fd );
154+
void accept( int fd ) override;
155155

156156
// shut-down server
157157
void teardown();

pc/request.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ void request_sub_set::teardown()
7676
request::request()
7777
: svr_( nullptr ),
7878
clnt_( nullptr ),
79-
cb_( nullptr ),
8079
is_submit_( false ),
8180
is_recv_( false )
8281
{

pc/request.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ namespace pc
112112

113113
manager *svr_;
114114
rpc_client *clnt_;
115-
rpc_sub *cb_;
116115
prev_next_t nd_[1];
117116
node_list_t slist_;
118117
bool is_submit_;

pcapps/admin_request.hpp

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ namespace pc
2525
void on_response( rpc::signature_subscribe * ) override;
2626

2727
private:
28+
using request::on_response;
29+
2830
typedef enum {
2931
e_create_sent, e_create_sig,
3032
e_init_sent, e_init_sig, e_done, e_error
@@ -57,6 +59,8 @@ namespace pc
5759
void on_response( rpc::signature_subscribe * ) override;
5860

5961
private:
62+
using request::on_response;
63+
6064
typedef enum {
6165
e_create_sent, e_create_sig,
6266
e_init_sent, e_init_sig, e_done, e_error
@@ -92,6 +96,8 @@ namespace pc
9296
void submit() override;
9397

9498
private:
99+
using request::on_response;
100+
95101
typedef enum {
96102
e_create_sent, e_create_sig,
97103
e_add_sent, e_add_sig, e_done, e_error
@@ -100,7 +106,6 @@ namespace pc
100106
state_t st_;
101107
commitment cmt_;
102108
key_pair akey_;
103-
key_pair skey_;
104109
key_pair mkey_;
105110
rpc::create_account areq_[1];
106111
rpc::add_product sreq_[1];
@@ -127,6 +132,8 @@ namespace pc
127132
void reset();
128133

129134
private:
135+
using request::on_response;
136+
130137
typedef enum {
131138
e_sent, e_sig, e_done, e_error
132139
} state_t;
@@ -163,6 +170,8 @@ namespace pc
163170
void submit() override;
164171

165172
private:
173+
using request::on_response;
174+
166175
typedef enum {
167176
e_create_sent, e_create_sig,
168177
e_add_sent, e_add_sig, e_done, e_error
@@ -172,7 +181,6 @@ namespace pc
172181
commitment cmt_;
173182
product *prod_;
174183
key_pair akey_;
175-
key_pair skey_;
176184
key_pair mkey_;
177185
rpc::create_account areq_[1];
178186
rpc::add_price sreq_[1];
@@ -198,6 +206,8 @@ namespace pc
198206
void submit() override;
199207

200208
private:
209+
using request::on_response;
210+
201211
typedef enum {
202212
e_init_sent, e_init_sig, e_done, e_error
203213
} state_t;
@@ -229,6 +239,8 @@ namespace pc
229239
void submit() override;
230240

231241
private:
242+
using request::on_response;
243+
232244
typedef enum {
233245
e_add_sent, e_add_sig, e_done, e_error
234246
} state_t;
@@ -237,7 +249,6 @@ namespace pc
237249
commitment cmt_;
238250
price *px_;
239251
key_pair akey_;
240-
key_pair mkey_;
241252
rpc::add_publisher req_[1];
242253
rpc::signature_subscribe sig_[1];
243254
};
@@ -261,6 +272,8 @@ namespace pc
261272
void submit() override;
262273

263274
private:
275+
using request::on_response;
276+
264277
typedef enum {
265278
e_add_sent, e_add_sig, e_done, e_error
266279
} state_t;
@@ -292,6 +305,8 @@ namespace pc
292305
void on_response( rpc::signature_subscribe * ) override;
293306

294307
private:
308+
using request::on_response;
309+
295310
typedef enum {
296311
e_create_sent, e_create_sig,
297312
e_init_sent, e_init_sig, e_done, e_error
@@ -321,6 +336,8 @@ namespace pc
321336
void on_response( rpc::account_subscribe * ) override;
322337

323338
private:
339+
using request::on_response;
340+
324341
typedef enum {
325342
e_upd_sent, e_upd_sig, e_get_sent, e_done, e_error
326343
} state_t;
@@ -348,6 +365,7 @@ namespace pc
348365
bool get_is_done() const override;
349366

350367
private:
368+
using request::on_response;
351369
typedef enum { e_sent, e_done, e_error } state_t;
352370
state_t st_;
353371
rpc::get_minimum_balance_rent_exemption req_[1];

0 commit comments

Comments
 (0)