From fa64452e7c7c1af8982833764fa6e6690fc0322b Mon Sep 17 00:00:00 2001
From: Patrick Simpson <p.simpson@etosis.com>
Date: Thu, 23 Nov 2017 10:53:38 +0200
Subject: [PATCH] Fix for release build

---
 src/AcaciaZPushPlugin/EASAccount/EASAccount.cpp     | 4 ++--
 src/AcaciaZPushPlugin/EASAccount/EASAccount.vcxproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/AcaciaZPushPlugin/EASAccount/EASAccount.cpp b/src/AcaciaZPushPlugin/EASAccount/EASAccount.cpp
index 51f2d6c..c42fd38 100644
--- a/src/AcaciaZPushPlugin/EASAccount/EASAccount.cpp
+++ b/src/AcaciaZPushPlugin/EASAccount/EASAccount.cpp
@@ -102,8 +102,8 @@ private:
 	static string WideToString(const wstring &s)
 	{
 		std::string result;
-		for (int i = 0; i < s.size(); ++i)
-			result += (char)s[i];
+		for (auto i = s.begin(); i != s.end(); ++i)
+			result += (char)*i;
 		return result;
 	}
 
diff --git a/src/AcaciaZPushPlugin/EASAccount/EASAccount.vcxproj b/src/AcaciaZPushPlugin/EASAccount/EASAccount.vcxproj
index 25f3328..9c12160 100644
--- a/src/AcaciaZPushPlugin/EASAccount/EASAccount.vcxproj
+++ b/src/AcaciaZPushPlugin/EASAccount/EASAccount.vcxproj
@@ -101,7 +101,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>crypt32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mapi32.lib;crypt32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -135,7 +135,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>crypt32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mapi32.lib;crypt32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">