Merge pull request #654 from reszelaz/patch-1

Fix interface name collission on MSC_VER = 1900
tango-controls · Jan 23, 2020 · 85fbfd3 · 85fbfd3
2 parents 81286b2 + 92586af
commit 85fbfd3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cppapi/server/dintrthread.h b/cppapi/server/dintrthread.h
@@ -58,7 +58,7 @@ struct _ShDevIntrTh
 	bool			cmd_pending;	// The new command flag
 	DevIntrCmdCode	cmd_code;		// The command code
 	bool			th_running;		// Thread running flag
-	#if _MSC_VER > 1900
+	#if _MSC_VER >= 1900
 	#ifdef interface
 	#undef interface
 	#endif