From adbc664125142c434294bfa795666c90c7608429 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Thu, 9 Mar 2017 18:49:24 +0100
Subject: Adjust for compilation on Visual Studio 2017

Building works however tests are not. Possibly linking with original hidapi solution would work.
---
 misc.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'misc.cc')

diff --git a/misc.cc b/misc.cc
index a76bfb6..f85d486 100644
--- a/misc.cc
+++ b/misc.cc
@@ -5,18 +5,19 @@
 #include <cstdlib>
 #include <cstring>
 #include "LibraryException.h"
+#include <vector>
 
 namespace nitrokey {
 namespace misc {
 
-std::vector<uint8_t> hex_string_to_byte(const char* hexString){
+::std::vector<uint8_t> hex_string_to_byte(const char* hexString){
     const size_t big_string_size = 256; //arbitrary 'big' number
     const size_t s_size = strlen(hexString);
     const size_t d_size = s_size/2;
     if (s_size%2!=0 || s_size>big_string_size){
         throw InvalidHexString(0);
     }
-    auto data = std::vector<uint8_t>();
+    auto data = ::std::vector<uint8_t>();
     data.reserve(d_size);
 
     char buf[2];
@@ -36,9 +37,9 @@ std::vector<uint8_t> hex_string_to_byte(const char* hexString){
 };
 
 #include <cctype>
-std::string hexdump(const char *p, size_t size, bool print_header,
+::std::string hexdump(const char *p, size_t size, bool print_header,
         bool print_ascii, bool print_empty) {
-  std::stringstream out;
+  ::std::stringstream out;
   char formatbuf[128];
   const char *pstart = p;
 
@@ -68,7 +69,7 @@ std::string hexdump(const char *p, size_t size, bool print_header,
             out << '.';
         }
       }
-    out << std::endl;
+    out << ::std::endl;
   }
   return out.str();
 }
-- 
cgit v1.2.1