From a0303f0a1fb0b527b125e114cfb7c8af57793377 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 20 Jul 2016 09:10:54 +0200 Subject: [PATCH] EAP-TTLS module and session data types for interactive prompt/response data changed to bool for simplicity of next commit --- lib/TTLS/include/Module.h | 2 +- lib/TTLS/include/Session.h | 2 +- lib/TTLS/src/Module.cpp | 2 +- lib/TTLS/src/Session.cpp | 10 +++++----- lib/TTLS_UI/include/Module.h | 2 +- lib/TTLS_UI/src/Module.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h index 236dbb2..5a9142a 100644 --- a/lib/TTLS/include/Module.h +++ b/lib/TTLS/include/Module.h @@ -35,7 +35,7 @@ namespace eap namespace eap { - class peer_ttls : public peer + class peer_ttls : public peer { public: /// diff --git a/lib/TTLS/include/Session.h b/lib/TTLS/include/Session.h index 1b34674..d5e1cc3 100644 --- a/lib/TTLS/include/Session.h +++ b/lib/TTLS/include/Session.h @@ -33,7 +33,7 @@ namespace eap namespace eap { - class session_ttls : public session + class session_ttls : public session { public: /// diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp index 4a658d2..09fb15d 100644 --- a/lib/TTLS/src/Module.cpp +++ b/lib/TTLS/src/Module.cpp @@ -28,7 +28,7 @@ using namespace winstd; // eap::peer_ttls ////////////////////////////////////////////////////////////////////// -eap::peer_ttls::peer_ttls() : peer(type_ttls) +eap::peer_ttls::peer_ttls() : peer(type_ttls) { } diff --git a/lib/TTLS/src/Session.cpp b/lib/TTLS/src/Session.cpp index 1b461ac..64009eb 100644 --- a/lib/TTLS/src/Session.cpp +++ b/lib/TTLS/src/Session.cpp @@ -28,19 +28,19 @@ using namespace winstd; // eap::session_ttls ////////////////////////////////////////////////////////////////////// -eap::session_ttls::session_ttls(_In_ module &mod) : session(mod) +eap::session_ttls::session_ttls(_In_ module &mod) : session(mod) { } eap::session_ttls::session_ttls(_In_ const session_ttls &other) : - session(other) + session(other) { } eap::session_ttls::session_ttls(_Inout_ session_ttls &&other) : - session(std::move(other)) + session(std::move(other)) { } @@ -48,7 +48,7 @@ eap::session_ttls::session_ttls(_Inout_ session_ttls &&other) : eap::session_ttls& eap::session_ttls::operator=(_In_ const session_ttls &other) { if (this != &other) - (session&)*this = other; + (session&)*this = other; return *this; } @@ -57,7 +57,7 @@ eap::session_ttls& eap::session_ttls::operator=(_In_ const session_ttls &other) eap::session_ttls& eap::session_ttls::operator=(_Inout_ session_ttls &&other) { if (this != &other) - (session&)*this = std::move(other); + (session&)*this = std::move(other); return *this; } diff --git a/lib/TTLS_UI/include/Module.h b/lib/TTLS_UI/include/Module.h index bc12364..97daf01 100644 --- a/lib/TTLS_UI/include/Module.h +++ b/lib/TTLS_UI/include/Module.h @@ -35,7 +35,7 @@ namespace eap namespace eap { - class peer_ttls_ui : public peer_ui + class peer_ttls_ui : public peer_ui { public: /// diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp index 19f2cdd..d775f69 100644 --- a/lib/TTLS_UI/src/Module.cpp +++ b/lib/TTLS_UI/src/Module.cpp @@ -25,7 +25,7 @@ // eap::peer_ttls_ui ////////////////////////////////////////////////////////////////////// -eap::peer_ttls_ui::peer_ttls_ui() : peer_ui(type_ttls) +eap::peer_ttls_ui::peer_ttls_ui() : peer_ui(type_ttls) { }