Skip to content

Commit 75cb5f6

Browse files
committed
Re-order the structure members to prevert "will be initialized after" warning
1 parent bfa9ab0 commit 75cb5f6

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Development/nmos/node_server.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ namespace nmos
3333
, load_dh_param(std::move(load_dh_param))
3434
, load_ca_certificates(std::move(load_ca_certificates))
3535
, load_client_certificate(std::move(load_client_certificate))
36+
, ca_certificate_received(std::move(ca_certificate_received))
37+
, rsa_server_certificate_received(std::move(rsa_server_certificate_received))
38+
, ecdsa_server_certificate_received(std::move(ecdsa_server_certificate_received))
3639
, system_changed(std::move(system_changed))
3740
, registration_changed(std::move(registration_changed))
3841
, parse_transport_file(std::move(parse_transport_file))
@@ -43,9 +46,6 @@ namespace nmos
4346
, get_ocsp_response(std::move(get_ocsp_response))
4447
, get_authorization_bearer_token(std::move(get_authorization_bearer_token))
4548
, validate_authorization(std::move(validate_authorization))
46-
, ca_certificate_received(std::move(ca_certificate_received))
47-
, rsa_server_certificate_received(std::move(rsa_server_certificate_received))
48-
, ecdsa_server_certificate_received(std::move(ecdsa_server_certificate_received))
4949
, ws_validate_authorization(std::move(ws_validate_authorization))
5050
, load_rsa_private_keys(std::move(load_rsa_private_keys))
5151
, load_authorization_clients(std::move(load_authorization_clients))
@@ -106,6 +106,10 @@ namespace nmos
106106
nmos::load_ca_certificates_handler load_ca_certificates;
107107
nmos::load_client_certificate_handler load_client_certificate;
108108

109+
nmos::experimental::receive_ca_certificate_handler ca_certificate_received;
110+
nmos::experimental::receive_server_certificate_handler rsa_server_certificate_received;
111+
nmos::experimental::receive_server_certificate_handler ecdsa_server_certificate_received;
112+
109113
nmos::system_global_handler system_changed;
110114
nmos::registration_handler registration_changed;
111115

@@ -120,10 +124,6 @@ namespace nmos
120124

121125
nmos::channelmapping_activation_handler channelmapping_activated;
122126

123-
nmos::experimental::receive_ca_certificate_handler ca_certificate_received;
124-
nmos::experimental::receive_server_certificate_handler rsa_server_certificate_received;
125-
nmos::experimental::receive_server_certificate_handler ecdsa_server_certificate_received;
126-
127127
nmos::ocsp_response_handler get_ocsp_response;
128128

129129
get_authorization_bearer_token_handler get_authorization_bearer_token;

Development/nmos/registry_server.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ namespace nmos
3030
: load_server_certificates(std::move(load_server_certificates))
3131
, load_dh_param(std::move(load_dh_param))
3232
, load_ca_certificates(std::move(load_ca_certificates))
33-
, get_ocsp_response(std::move(get_ocsp_response))
34-
, validate_authorization(std::move(validate_authorization))
35-
, ws_validate_authorization(std::move(ws_validate_authorization))
3633
, load_client_certificate(std::move(load_client_certificate))
3734
, ca_certificate_received(std::move(ca_certificate_received))
3835
, rsa_server_certificate_received(std::move(rsa_server_certificate_received))
3936
, ecdsa_server_certificate_received(std::move(ecdsa_server_certificate_received))
37+
, get_ocsp_response(std::move(get_ocsp_response))
38+
, validate_authorization(std::move(validate_authorization))
39+
, ws_validate_authorization(std::move(ws_validate_authorization))
4040
{}
4141

4242
// use the default constructor and chaining member functions for fluent initialization

0 commit comments

Comments
 (0)