From 1f6716b27939c4eef716968fb0b5055a583f5340 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 19 Nov 2021 15:48:06 +0100
Subject: [PATCH] Cleanup WINSTD_NOVTABLE/__declspec(novtable)

This was originally intended as a compiler hint.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 lib/EAPBase/include/EAP.h       |  8 ++++----
 lib/MSCHAPv2/include/MSCHAPv2.h | 24 ++++++++++++------------
 lib/WinStd                      |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/EAPBase/include/EAP.h b/lib/EAPBase/include/EAP.h
index d0d3468..1596075 100644
--- a/lib/EAPBase/include/EAP.h
+++ b/lib/EAPBase/include/EAP.h
@@ -79,8 +79,8 @@ namespace eap
 
     class packable;
 
-    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f;
-    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf;
+    template<size_t N> struct sanitizing_blob_f;
+    template<size_t N> struct sanitizing_blob_zf;
 
     ///
     /// \defgroup EAPBaseSanitizing  Sanitizing memory
@@ -653,7 +653,7 @@ namespace eap
     ///
     /// Sanitizing BLOB of fixed size
     ///
-    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f
+    template<size_t N> struct sanitizing_blob_f
     {
         unsigned char data[N]; ///< BLOB data
 
@@ -807,7 +807,7 @@ namespace eap
     ///
     /// Sanitizing BLOB of fixed size (zero initialized)
     ///
-    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf : sanitizing_blob_f<N>
+    template<size_t N> struct sanitizing_blob_zf : sanitizing_blob_f<N>
     {
         ///
         /// Constructor
diff --git a/lib/MSCHAPv2/include/MSCHAPv2.h b/lib/MSCHAPv2/include/MSCHAPv2.h
index 693f257..337672f 100644
--- a/lib/MSCHAPv2/include/MSCHAPv2.h
+++ b/lib/MSCHAPv2/include/MSCHAPv2.h
@@ -24,12 +24,12 @@
 namespace eap
 {
     enum class chap_packet_code_t : unsigned char;
-    struct WINSTD_NOVTABLE chap_header;
-    struct WINSTD_NOVTABLE challenge_mschapv2;
-    struct WINSTD_NOVTABLE challenge_hash;
-    struct WINSTD_NOVTABLE nt_password_hash;
-    struct WINSTD_NOVTABLE nt_response;
-    struct WINSTD_NOVTABLE authenticator_response;
+    struct chap_header;
+    struct challenge_mschapv2;
+    struct challenge_hash;
+    struct nt_password_hash;
+    struct nt_response;
+    struct authenticator_response;
 
     ///
     /// \defgroup MSCHAPv2  MSCHAPv2
@@ -80,7 +80,7 @@ namespace eap
     ///
     /// CHAP packet header base class
     ///
-    struct WINSTD_NOVTABLE chap_header
+    struct chap_header
     {
         chap_packet_code_t code;    ///< CHAP packet code
         unsigned char ident;        ///< CHAP identifier
@@ -91,7 +91,7 @@ namespace eap
     ///
     /// MSCHAPv2 Challenge
     ///
-    struct WINSTD_NOVTABLE challenge_mschapv2 : public sanitizing_blob_xf<16>
+    struct challenge_mschapv2 : public sanitizing_blob_xf<16>
     {
         ///
         /// Generates random challenge
@@ -105,7 +105,7 @@ namespace eap
     ///
     /// MSCHAPv2 Challenge Hash
     ///
-    struct WINSTD_NOVTABLE challenge_hash : public sanitizing_blob_xf<8>
+    struct challenge_hash : public sanitizing_blob_xf<8>
     {
         ///
         /// Constructor
@@ -149,7 +149,7 @@ namespace eap
     ///
     /// NT-Password Hash
     ///
-    struct WINSTD_NOVTABLE nt_password_hash : public sanitizing_blob_xf<16>
+    struct nt_password_hash : public sanitizing_blob_xf<16>
     {
         ///
         /// Constructor
@@ -201,7 +201,7 @@ namespace eap
     ///
     /// NT-Response
     ///
-    struct WINSTD_NOVTABLE nt_response : public sanitizing_blob_xf<24>
+    struct nt_response : public sanitizing_blob_xf<24>
     {
         ///
         /// Constructor
@@ -247,7 +247,7 @@ namespace eap
     ///
     /// Authenticator Response
     ///
-    struct WINSTD_NOVTABLE authenticator_response : public sanitizing_blob_xf<20>
+    struct authenticator_response : public sanitizing_blob_xf<20>
     {
         ///
         /// Constructor
diff --git a/lib/WinStd b/lib/WinStd
index 85075cd..7188af8 160000
--- a/lib/WinStd
+++ b/lib/WinStd
@@ -1 +1 @@
-Subproject commit 85075cd419df9488e13f5ebc8aaaf1d65c72ed66
+Subproject commit 7188af8e7172ca64789b57bf69a9511219f2762b