Fix compile error with most recent msvc

leg0 · leg0 · commit 5a304542aff2 · 2021-09-08T22:26:58.000+03:00
diff --git a/DLL/Beholder/Hardware.cpp b/DLL/Beholder/Hardware.cpp
@@ -38,7 +38,7 @@ static int beholder_decode(rbuf* rec_buffer, hardware const*, ir_remote *remote,
 	if(!success) return 0;
 
 	using namespace std::chrono;
-	winlirc_map_gap(remote, duration_cast<microseconds>(last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
+	winlirc_map_gap(remote, duration_cast<microseconds>(::last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
 
 	return 1;
 } 
diff --git a/DLL/Beholder/SendReceiveData.cpp b/DLL/Beholder/SendReceiveData.cpp
@@ -157,7 +157,7 @@ void SendReceiveData::getCode()
 
 		EnterCriticalSection(&criticalSection);
 			start	= tempStart;
-			last	= tempLast;
+			::last	= tempLast;
 			end		= tempEnd;
 			irCode	= tempCode;
 		LeaveCriticalSection(&criticalSection);
diff --git a/DLL/Cyberlink/Hardware.cpp b/DLL/Cyberlink/Hardware.cpp
@@ -39,7 +39,7 @@ static int cyberlink_receive_decode (rbuf* rec_buffer, hardware const*, ir_remot
 	if(!success) return 0;
 
 	using namespace std::chrono;
-	winlirc_map_gap(remote, duration_cast<microseconds>(last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
+	winlirc_map_gap(remote, duration_cast<microseconds>(::last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
 	
 	return 1;
 }
diff --git a/DLL/Geniatech/GeniatechRC.cpp b/DLL/Geniatech/GeniatechRC.cpp
@@ -122,7 +122,7 @@ WL_API int decodeIR(struct ir_remote *remotes, char *out, size_t out_size) {
 			return 0;
 		}
 
-		last = end;
+		::last = end;
 		start = steady_clock::now();
 		receive->getData(&irCode);
 		end = steady_clock::now();
diff --git a/DLL/Geniatech/Hardware.cpp b/DLL/Geniatech/Hardware.cpp
@@ -43,7 +43,7 @@ int gnt_decode (rbuf* rec_buffer, hardware const*,ir_remote *remote, ir_code *pr
 
 	if(!success) return 0;
 
-	winlirc_map_gap(remote, duration_cast<microseconds>(last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
+	winlirc_map_gap(remote, duration_cast<microseconds>(::last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
 	
 	return 1;
 }
diff --git a/DLL/IRMan/Hardware.cpp b/DLL/IRMan/Hardware.cpp
@@ -46,7 +46,7 @@ static int irman_decode (rbuf* rec_buffer, hardware const*,ir_remote *remote, ir
 	if(!success) return 0;
 
 	using namespace std::chrono;
-	winlirc_map_gap(remote, duration_cast<microseconds>(last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
+	winlirc_map_gap(remote, duration_cast<microseconds>(::last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
 	
 	return 1;
 }
diff --git a/DLL/TbsCxt/Hardware.cpp b/DLL/TbsCxt/Hardware.cpp
@@ -41,7 +41,7 @@ static int tbs_decode (rbuf* rec_buffer, hardware const*, ir_remote *remote, ir_
 	if(!success) return 0;
 
 	using namespace std::chrono;
-	winlirc_map_gap(remote, duration_cast<microseconds>(last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
+	winlirc_map_gap(remote, duration_cast<microseconds>(::last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
 	
 	return 1;
 }
diff --git a/DLL/TbsQBOX/Hardware.cpp b/DLL/TbsQBOX/Hardware.cpp
@@ -42,7 +42,7 @@ static int tbs_decode (rbuf* rec_buffer, hardware const*, ir_remote *remote, ir_
 
 	if(!success) return 0;
 
-	winlirc_map_gap(remote, duration_cast<microseconds>(last - start).count(), 0, repeat_flagp, min_remaining_gapp, max_remaining_gapp);
+	winlirc_map_gap(remote, duration_cast<microseconds>(::last - start).count(), 0, repeat_flagp, min_remaining_gapp, max_remaining_gapp);
 	
 	return 1;
 }
diff --git a/DLL/TeVii/Hardware.cpp b/DLL/TeVii/Hardware.cpp
@@ -43,7 +43,7 @@ int tevii_decode (rbuf* rec_buffer, hardware const*, ir_remote *remote, ir_code
 
 	if(!success) return 0;
 
-	winlirc_map_gap(remote, duration_cast<microseconds>(last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
+	winlirc_map_gap(remote, duration_cast<microseconds>(::last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
 	
 	return 1;
 }
diff --git a/DLL/TeVii/TeViiRC.cpp b/DLL/TeVii/TeViiRC.cpp
@@ -155,7 +155,7 @@ WL_API int decodeIR(struct ir_remote *remotes, char *out, size_t out_size) {
 			return 0;
 		}
 
-		last = end;
+		::last = end;
 		start = steady_clock::now();
 		receive->getData(&irCode);
 		end = steady_clock::now();
diff --git a/DLL/Technisat/Hardware.cpp b/DLL/Technisat/Hardware.cpp
@@ -35,7 +35,7 @@ static int technisat_decode(rbuf* rec_buffer, hardware const*, ir_remote *remote
 	if(!success) return 0;
 
 	using namespace std::chrono;
-	winlirc_map_gap(remote, duration_cast<microseconds>(last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
+	winlirc_map_gap(remote, duration_cast<microseconds>(::last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
 	
 	return 1;
 }
diff --git a/DLL/Tira/Hardware.cpp b/DLL/Tira/Hardware.cpp
@@ -67,7 +67,7 @@ static int tira_decode (rbuf* rec_buffer, hardware const*, ir_remote *remote, ir
 	if(!success) return 0;
 
 	using namespace std::chrono;
-	winlirc_map_gap(remote, duration_cast<microseconds>(last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
+	winlirc_map_gap(remote, duration_cast<microseconds>(::last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);
 	
 	return 1;
 }
diff --git a/quickstart.bat b/quickstart.bat
@@ -18,7 +18,7 @@ git submodule update --init
 
 pushd vcpkg
 if not exist vcpkg.exe (call bootstrap-vcpkg.bat)
-::vcpkg install @%source_dir%\cmake\vcpkg_%arch%-windows.txt 
+vcpkg install @%source_dir%\cmake\vcpkg_%arch%-windows.txt 
 popd
 
 mkdir %build_dir%

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ static int beholder_decode(rbuf* rec_buffer, hardware const, ir_remote remote,`
`38`	`38`	`if(!success) return 0;`
`39`	`39`
`40`	`40`	`using namespace std::chrono;`
`41`		`- winlirc_map_gap(remote, duration_cast<microseconds>(last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
	`41`	`+ winlirc_map_gap(remote, duration_cast<microseconds>(::last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
`42`	`42`
`43`	`43`	`return 1;`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ static int cyberlink_receive_decode (rbuf* rec_buffer, hardware const*, ir_remot`
`39`	`39`	`if(!success) return 0;`
`40`	`40`
`41`	`41`	`using namespace std::chrono;`
`42`		`- winlirc_map_gap(remote, duration_cast<microseconds>(last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
	`42`	`+ winlirc_map_gap(remote, duration_cast<microseconds>(::last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
`43`	`43`
`44`	`44`	`return 1;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ WL_API int decodeIR(struct ir_remote remotes, char out, size_t out_size) {`
`122`	`122`	`return 0;`
`123`	`123`	`}`
`124`	`124`
`125`		`- last = end;`
	`125`	`+ ::last = end;`
`126`	`126`	`start = steady_clock::now();`
`127`	`127`	`receive->getData(&irCode);`
`128`	`128`	`end = steady_clock::now();`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ int gnt_decode (rbuf* rec_buffer, hardware const,ir_remote remote, ir_code *pr`
`43`	`43`
`44`	`44`	`if(!success) return 0;`
`45`	`45`
`46`		`- winlirc_map_gap(remote, duration_cast<microseconds>(last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
	`46`	`+ winlirc_map_gap(remote, duration_cast<microseconds>(::last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
`47`	`47`
`48`	`48`	`return 1;`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ static int irman_decode (rbuf* rec_buffer, hardware const,ir_remote remote, ir`
`46`	`46`	`if(!success) return 0;`
`47`	`47`
`48`	`48`	`using namespace std::chrono;`
`49`		`- winlirc_map_gap(remote, duration_cast<microseconds>(last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
	`49`	`+ winlirc_map_gap(remote, duration_cast<microseconds>(::last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
`50`	`50`
`51`	`51`	`return 1;`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static int tbs_decode (rbuf* rec_buffer, hardware const, ir_remote remote, ir_`
`41`	`41`	`if(!success) return 0;`
`42`	`42`
`43`	`43`	`using namespace std::chrono;`
`44`		`- winlirc_map_gap(remote, duration_cast<microseconds>(last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
	`44`	`+ winlirc_map_gap(remote, duration_cast<microseconds>(::last - start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
`45`	`45`
`46`	`46`	`return 1;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ static int tbs_decode (rbuf* rec_buffer, hardware const, ir_remote remote, ir_`
`42`	`42`
`43`	`43`	`if(!success) return 0;`
`44`	`44`
`45`		`- winlirc_map_gap(remote, duration_cast<microseconds>(last - start).count(), 0, repeat_flagp, min_remaining_gapp, max_remaining_gapp);`
	`45`	`+ winlirc_map_gap(remote, duration_cast<microseconds>(::last - start).count(), 0, repeat_flagp, min_remaining_gapp, max_remaining_gapp);`
`46`	`46`
`47`	`47`	`return 1;`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ int tevii_decode (rbuf* rec_buffer, hardware const, ir_remote remote, ir_code`
`43`	`43`
`44`	`44`	`if(!success) return 0;`
`45`	`45`
`46`		`- winlirc_map_gap(remote, duration_cast<microseconds>(last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
	`46`	`+ winlirc_map_gap(remote, duration_cast<microseconds>(::last-start).count(), 0, repeat_flagp,min_remaining_gapp, max_remaining_gapp);`
`47`	`47`
`48`	`48`	`return 1;`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ WL_API int decodeIR(struct ir_remote remotes, char out, size_t out_size) {`
`155`	`155`	`return 0;`
`156`	`156`	`}`
`157`	`157`
`158`		`- last = end;`
	`158`	`+ ::last = end;`
`159`	`159`	`start = steady_clock::now();`
`160`	`160`	`receive->getData(&irCode);`
`161`	`161`	`end = steady_clock::now();`