From 34ef00c8bce5a65fc8a31424831bcd343959ec21 Mon Sep 17 00:00:00 2001
From: gabime <gmelman1@gmail.com>
Date: Mon, 11 Jul 2016 18:58:00 +0300
Subject: [PATCH] updated tests to vs 2015 and fix warning

---
 tests/logs/.gitignore | 2 --
 tests/tests.vcxproj   | 4 ++--
 tests/utils.cpp       | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 tests/logs/.gitignore

diff --git a/tests/logs/.gitignore b/tests/logs/.gitignore
deleted file mode 100644
index 3abf6dea..00000000
--- a/tests/logs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.txt
-*.log
diff --git a/tests/tests.vcxproj b/tests/tests.vcxproj
index 2e72e181..f05c1628 100644
--- a/tests/tests.vcxproj
+++ b/tests/tests.vcxproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -38,7 +38,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/tests/utils.cpp b/tests/utils.cpp
index 751ff820..9fe8b162 100644
--- a/tests/utils.cpp
+++ b/tests/utils.cpp
@@ -41,5 +41,5 @@ std::size_t get_filesize(const std::string& filename)
     if (!ifs)
         throw std::runtime_error("Failed open file ");
 
-    return ifs.tellg();
+    return static_cast<std::size_t>(ifs.tellg());
 }