"auto" simplified

This commit is contained in:
Simon Rozman 2016-10-10 14:58:07 +02:00
parent f9697dfcee
commit 7a26128c7b
5 changed files with 9 additions and 9 deletions

View File

@ -452,7 +452,7 @@ eap::credentials::source_t eap::credentials_pass::combine(
return source_cache; return source_cache;
} }
auto const *cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg); auto cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg);
if (cfg_with_cred && cfg_with_cred->m_use_cred) { if (cfg_with_cred && cfg_with_cred->m_use_cred) {
// Using configured credentials. // Using configured credentials.
*this = *dynamic_cast<const credentials_pass*>(cfg_with_cred->m_cred.get()); *this = *dynamic_cast<const credentials_pass*>(cfg_with_cred->m_cred.get());

View File

@ -278,7 +278,7 @@ eap::credentials::source_t eap::credentials_eapmsg::combine(
// } // }
//} //}
auto const *cfg_eapmsg = dynamic_cast<const config_method_eapmsg*>(&cfg); auto cfg_eapmsg = dynamic_cast<const config_method_eapmsg*>(&cfg);
BOOL fInvokeUI = FALSE; BOOL fInvokeUI = FALSE;
DWORD cred_data_size = 0; DWORD cred_data_size = 0;
eap_blob_runtime cred_data; eap_blob_runtime cred_data;

View File

@ -307,7 +307,7 @@ eap::credentials::source_t eap::credentials_tls::combine(
return source_cache; return source_cache;
} }
auto const *cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg); auto cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg);
if (cfg_with_cred->m_use_cred) { if (cfg_with_cred->m_use_cred) {
// Using configured credentials. // Using configured credentials.
*this = *dynamic_cast<const credentials_tls*>(cfg_with_cred->m_cred.get()); *this = *dynamic_cast<const credentials_tls*>(cfg_with_cred->m_cred.get());

View File

@ -64,9 +64,9 @@ void eap::method_ttls::begin_session(
method_tls::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize); method_tls::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
// Initialize inner method. // Initialize inner method.
auto * cfg_inner = dynamic_cast<config_method_ttls &>(m_cfg ).m_inner.get(); auto cfg_inner = dynamic_cast<config_method_ttls &>(m_cfg ).m_inner.get();
auto *cred_inner = dynamic_cast<credentials_ttls &>(m_cred).m_inner.get(); auto cred_inner = dynamic_cast<credentials_ttls &>(m_cred).m_inner.get();
auto *cfg_inner_eapmsg = dynamic_cast<config_method_eapmsg*>(cfg_inner); auto cfg_inner_eapmsg = dynamic_cast<config_method_eapmsg*>(cfg_inner);
if (!cfg_inner_eapmsg) { if (!cfg_inner_eapmsg) {
// Native inner methods // Native inner methods
switch (cfg_inner->get_method_id()) { switch (cfg_inner->get_method_id()) {

View File

@ -234,9 +234,9 @@ wxTTLSConfigWindow::~wxTTLSConfigWindow()
bool wxTTLSConfigWindow::TransferDataToWindow() bool wxTTLSConfigWindow::TransferDataToWindow()
{ {
auto &cfg_ttls = dynamic_cast<eap::config_method_ttls&>(m_cfg); auto cfg_ttls = dynamic_cast<eap::config_method_ttls&>(m_cfg);
auto *cfg_inner_eapmsg = dynamic_cast<eap::config_method_eapmsg*>(cfg_ttls.m_inner.get()); auto cfg_inner_eapmsg = dynamic_cast<eap::config_method_eapmsg*>(cfg_ttls.m_inner.get());
if (!cfg_inner_eapmsg) { if (!cfg_inner_eapmsg) {
// Native inner methods // Native inner methods
switch (cfg_ttls.m_inner->get_method_id()) { switch (cfg_ttls.m_inner->get_method_id()) {
@ -269,7 +269,7 @@ bool wxTTLSConfigWindow::TransferDataFromWindow()
{ {
wxCHECK(wxScrolledWindow::TransferDataFromWindow(), false); wxCHECK(wxScrolledWindow::TransferDataFromWindow(), false);
auto &cfg_ttls = dynamic_cast<eap::config_method_ttls&>(m_cfg); auto cfg_ttls = dynamic_cast<eap::config_method_ttls&>(m_cfg);
if (!m_prov.m_read_only) { if (!m_prov.m_read_only) {
// This is not a provider-locked configuration. Save the data. // This is not a provider-locked configuration. Save the data.