From 7a26128c7b0d15dc62cbb989f21bfc690dab5e0d Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 10 Oct 2016 14:58:07 +0200 Subject: [PATCH] "auto" simplified --- lib/EAPBase/src/Credentials.cpp | 2 +- lib/EAPMsg/src/Credentials.cpp | 2 +- lib/TLS/src/Credentials.cpp | 2 +- lib/TTLS/src/Method.cpp | 6 +++--- lib/TTLS_UI/src/TTLS_UI.cpp | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/EAPBase/src/Credentials.cpp b/lib/EAPBase/src/Credentials.cpp index 96bb1b2..88acfd3 100644 --- a/lib/EAPBase/src/Credentials.cpp +++ b/lib/EAPBase/src/Credentials.cpp @@ -452,7 +452,7 @@ eap::credentials::source_t eap::credentials_pass::combine( return source_cache; } - auto const *cfg_with_cred = dynamic_cast(&cfg); + auto cfg_with_cred = dynamic_cast(&cfg); if (cfg_with_cred && cfg_with_cred->m_use_cred) { // Using configured credentials. *this = *dynamic_cast(cfg_with_cred->m_cred.get()); diff --git a/lib/EAPMsg/src/Credentials.cpp b/lib/EAPMsg/src/Credentials.cpp index 5088b1e..43a6cd1 100644 --- a/lib/EAPMsg/src/Credentials.cpp +++ b/lib/EAPMsg/src/Credentials.cpp @@ -278,7 +278,7 @@ eap::credentials::source_t eap::credentials_eapmsg::combine( // } //} - auto const *cfg_eapmsg = dynamic_cast(&cfg); + auto cfg_eapmsg = dynamic_cast(&cfg); BOOL fInvokeUI = FALSE; DWORD cred_data_size = 0; eap_blob_runtime cred_data; diff --git a/lib/TLS/src/Credentials.cpp b/lib/TLS/src/Credentials.cpp index 9382945..b5317bd 100644 --- a/lib/TLS/src/Credentials.cpp +++ b/lib/TLS/src/Credentials.cpp @@ -307,7 +307,7 @@ eap::credentials::source_t eap::credentials_tls::combine( return source_cache; } - auto const *cfg_with_cred = dynamic_cast(&cfg); + auto cfg_with_cred = dynamic_cast(&cfg); if (cfg_with_cred->m_use_cred) { // Using configured credentials. *this = *dynamic_cast(cfg_with_cred->m_cred.get()); diff --git a/lib/TTLS/src/Method.cpp b/lib/TTLS/src/Method.cpp index e824931..785b7e9 100644 --- a/lib/TTLS/src/Method.cpp +++ b/lib/TTLS/src/Method.cpp @@ -64,9 +64,9 @@ void eap::method_ttls::begin_session( method_tls::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize); // Initialize inner method. - auto * cfg_inner = dynamic_cast(m_cfg ).m_inner.get(); - auto *cred_inner = dynamic_cast(m_cred).m_inner.get(); - auto *cfg_inner_eapmsg = dynamic_cast(cfg_inner); + auto cfg_inner = dynamic_cast(m_cfg ).m_inner.get(); + auto cred_inner = dynamic_cast(m_cred).m_inner.get(); + auto cfg_inner_eapmsg = dynamic_cast(cfg_inner); if (!cfg_inner_eapmsg) { // Native inner methods switch (cfg_inner->get_method_id()) { diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index 17f1c62..ebf267a 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -234,9 +234,9 @@ wxTTLSConfigWindow::~wxTTLSConfigWindow() bool wxTTLSConfigWindow::TransferDataToWindow() { - auto &cfg_ttls = dynamic_cast(m_cfg); + auto cfg_ttls = dynamic_cast(m_cfg); - auto *cfg_inner_eapmsg = dynamic_cast(cfg_ttls.m_inner.get()); + auto cfg_inner_eapmsg = dynamic_cast(cfg_ttls.m_inner.get()); if (!cfg_inner_eapmsg) { // Native inner methods switch (cfg_ttls.m_inner->get_method_id()) { @@ -269,7 +269,7 @@ bool wxTTLSConfigWindow::TransferDataFromWindow() { wxCHECK(wxScrolledWindow::TransferDataFromWindow(), false); - auto &cfg_ttls = dynamic_cast(m_cfg); + auto cfg_ttls = dynamic_cast(m_cfg); if (!m_prov.m_read_only) { // This is not a provider-locked configuration. Save the data.