From a9baa0722714a76b5ae29aab173dc1487dfda3ec Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 23 Aug 2016 22:41:12 +0200 Subject: [PATCH] Error type detection fixed --- lib/EAPBase/src/Module.cpp | 22 +++++++++++----------- lib/WinStd | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/EAPBase/src/Module.cpp b/lib/EAPBase/src/Module.cpp index c5a0bf6..f6ab578 100644 --- a/lib/EAPBase/src/Module.cpp +++ b/lib/EAPBase/src/Module.cpp @@ -91,26 +91,26 @@ EAP_ERROR* eap::module::make_error(_In_ std::exception &err) const MultiByteToWideChar(CP_ACP, 0, err.what(), -1, what); { - win_runtime_error &e(dynamic_cast(err)); - if (&e) - return make_error(e.number(), what.c_str()); + win_runtime_error *e = dynamic_cast(&err); + if (e) + return make_error(e->number(), what.c_str()); } { - com_runtime_error &e(dynamic_cast(err)); - if (&e) - return make_error(HRESULT_CODE(e.number()), what.c_str()); + com_runtime_error *e = dynamic_cast(&err); + if (e) + return make_error(HRESULT_CODE(e->number()), what.c_str()); } { - sec_runtime_error &e(dynamic_cast(err)); - if (&e) - return make_error(SCODE_CODE(e.number()), what.c_str()); + sec_runtime_error *e = dynamic_cast(&err); + if (e) + return make_error(SCODE_CODE(e->number()), what.c_str()); } { - invalid_argument &e(dynamic_cast(err)); - if (&e) + invalid_argument *e = dynamic_cast(&err); + if (e) return make_error(ERROR_INVALID_PARAMETER, what.c_str()); } diff --git a/lib/WinStd b/lib/WinStd index f94b723..9867626 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit f94b72379ec67fad89a99336048890c4e7ddda34 +Subproject commit 986762649ff433b5f4321b805239fcd8f4da17f5