From ab0f01c381c16ed61b8258582869912d4c38cbb7 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Wed, 28 Jun 2017 11:57:21 +0200
Subject: Adjust code to make compilation under MSVC 2017

---
 include/stick20_commands.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/stick20_commands.h')

diff --git a/include/stick20_commands.h b/include/stick20_commands.h
index 5f99d28..64df372 100644
--- a/include/stick20_commands.h
+++ b/include/stick20_commands.h
@@ -111,7 +111,7 @@ namespace nitrokey {
                   std::string dissect() const {
                     std::stringstream ss;
                     ss << "_padding:" << std::endl
-                       << ::nitrokey::misc::hexdump((const char *) (_padding),
+                       << ::nitrokey::misc::hexdump((const uint8_t *) (_padding),
                                                     sizeof _padding);
                     print_to_ss((int) SendCounter_u8);
                     print_to_ss((int) SendDataType_u8);
@@ -138,9 +138,9 @@ namespace nitrokey {
                     union{
                     uint8_t VersionInfo_au8[4];
                         struct {
-                            uint8_t __reserved;
+                            uint8_t _reserved;
                             uint8_t minor;
-                            uint8_t __reserved2;
+                            uint8_t _reserved2;
                             uint8_t major;
                         } __packed versionInfo;
                     } __packed;
-- 
cgit v1.2.1