updated tests to vs 2015 and fix warning

This commit is contained in:
gabime 2016-07-11 18:58:00 +03:00
parent 3aef25c948
commit 34ef00c8bc
3 changed files with 3 additions and 5 deletions

View File

@ -1,2 +0,0 @@
*.txt
*.log

View File

@ -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>

View File

@ -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());
}