aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-10-10 18:46:40 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2016-10-10 18:46:40 -0700
commit38bf4de0fe4772f9aa7c9b5884617369638ba0d8 (patch)
treeb12722596709f870414b298f0938cd4c9b8eba4d /toolsrc/src
parenta6f8650edbd13023b271dd8cb10b3538121d7a35 (diff)
downloadvcpkg-38bf4de0fe4772f9aa7c9b5884617369638ba0d8.tar.gz
vcpkg-38bf4de0fe4772f9aa7c9b5884617369638ba0d8.zip
Rename System::Stopwatch to System::Stopwatch2
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/commands_installation.cpp2
-rw-r--r--toolsrc/src/main.cpp2
-rw-r--r--toolsrc/src/vcpkg_System.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp
index 6fe6aa9a1..7e7da9e3f 100644
--- a/toolsrc/src/commands_installation.cpp
+++ b/toolsrc/src/commands_installation.cpp
@@ -31,7 +31,7 @@ namespace vcpkg
port_dir.generic_wstring(),
ports_cmake_script_path.generic_wstring());
- System::Stopwatch timer;
+ System::Stopwatch2 timer;
timer.start();
int return_code = System::cmd_execute(command);
timer.stop();
diff --git a/toolsrc/src/main.cpp b/toolsrc/src/main.cpp
index f3d68f5dd..2200cd105 100644
--- a/toolsrc/src/main.cpp
+++ b/toolsrc/src/main.cpp
@@ -153,7 +153,7 @@ static void loadConfig()
}
}
-static System::Stopwatch g_timer;
+static System::Stopwatch2 g_timer;
static std::string trim_path_from_command_line(const std::string& full_command_line)
{
diff --git a/toolsrc/src/vcpkg_System.cpp b/toolsrc/src/vcpkg_System.cpp
index 4dc37857d..cc7080069 100644
--- a/toolsrc/src/vcpkg_System.cpp
+++ b/toolsrc/src/vcpkg_System.cpp
@@ -90,20 +90,20 @@ namespace vcpkg {namespace System
return ret;
}
- void Stopwatch::start()
+ void Stopwatch2::start()
{
static_assert(sizeof(start_time) == sizeof(LARGE_INTEGER), "");
QueryPerformanceCounter(reinterpret_cast<LARGE_INTEGER*>(&start_time));
}
- void Stopwatch::stop()
+ void Stopwatch2::stop()
{
QueryPerformanceCounter(reinterpret_cast<LARGE_INTEGER*>(&end_time));
QueryPerformanceFrequency(reinterpret_cast<LARGE_INTEGER*>(&freq));
}
- double Stopwatch::microseconds() const
+ double Stopwatch2::microseconds() const
{
return (reinterpret_cast<const LARGE_INTEGER*>(&end_time)->QuadPart -
reinterpret_cast<const LARGE_INTEGER*>(&start_time)->QuadPart) * 1000000.0 / reinterpret_cast<const LARGE_INTEGER*>(&freq)->QuadPart;