Updated project to vs2017

MewX · Sep 30, 2018 · 2a2b291 · 2a2b291
1 parent 2520cbc
commit 2a2b291
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+.vs/
+*.htm
+*.html
+Debug/
+Release/
+*.vcxproj.user
diff --git a/CrossChannel_Program/CrossChannel_Program/CrossChannel_Program.vcxproj b/CrossChannel_Program/CrossChannel_Program/CrossChannel_Program.vcxproj
@@ -14,19 +14,20 @@
     <ProjectGuid>{8F499700-DA07-4F0D-A96E-9A480852F129}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CrossChannel_Program</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/CrossChannel_Program/CrossChannel_Program/EasyUnicodeFileLE.cpp b/CrossChannel_Program/CrossChannel_Program/EasyUnicodeFileLE.cpp
@@ -131,8 +131,8 @@ void EasyUnicodeFileLE::close( )
 
 wchar_t EasyUnicodeFileLE::readWchar( )//读取一个宽字符
 {
-	if( !IsReadMode ) return L'';//输出模式不允许读入
-	if( IsEOF( ) ) return L'';//如果已经在文件尾了，就不读了
+	if( !IsReadMode ) return 0;//输出模式不允许读入
+	if( IsEOF( ) ) return 0;//如果已经在文件尾了，就不读了
 
 	wchar_t Temp2[ 2 ];
 	wchar_t tempWC[ 2 ];
@@ -154,7 +154,7 @@ void EasyUnicodeFileLE::close( )
 	catch( ... ) {
 		cout << "ERROR_EUFLE008 - Unknown error." << endl;
 		system( "PAUSE" );
-		return L'';
+		return 0;
 	}
 	return tempWC[ 0 ];
 }