Removed need for a vcpkg patch file.

DigitalInBlue · Feb 27, 2021 · b9bbe63 · b9bbe63
1 parent ee16f37
commit b9bbe63
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/Console.cpp b/src/Console.cpp
@@ -20,7 +20,7 @@
 
 using namespace celero;
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #include <stdio.h>
 #else

diff --git a/src/Exceptions.cpp b/src/Exceptions.cpp
@@ -18,10 +18,12 @@
 
 #include <celero/Exceptions.h>
 
+//
+
 #include <celero/Console.h>
 #include <celero/TestFixture.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif // WIN32
 
@@ -210,7 +212,7 @@ namespace celero
 			celero::console::SetConsoleColor(celero::console::ConsoleColor::Default);
 			return std::make_pair(false, 0);
 		}
-#else  // CELERO_HAS_SEH
+#else // CELERO_HAS_SEH
 		return std::make_pair(true, test.run(threads, calls, experimentValue));
 #endif // CELERO_HAS_SEH
 	}
@@ -239,7 +241,7 @@ namespace celero
 			}
 
 			return std::make_pair(false, 0);
-#else  // CELERO_HAS_EXCEPTIONS
+#else // CELERO_HAS_EXCEPTIONS
 			return RunAndCatchSEHExc(test, threads, calls, experimentValue);
 #endif // CELERO_HAS_EXCEPTIONS
 		}

diff --git a/src/Timer.cpp b/src/Timer.cpp
@@ -18,9 +18,10 @@
 
 #include <celero/Print.h>
 #include <celero/Timer.h>
+
 #include <iostream>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 LARGE_INTEGER QPCFrequency;
 #else

diff --git a/src/Utilities.cpp b/src/Utilities.cpp
@@ -19,9 +19,9 @@
 #include <celero/Print.h>
 #include <celero/Utilities.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
-
+//
 #include <powrprof.h>
 #endif