aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/main.cpp
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2016-10-10 23:07:29 -0700
committerRobert Schumacher <roschuma@microsoft.com>2016-10-10 23:07:29 -0700
commit9e1d40e4dc313de2e6de0ac4f60a2df224215ae2 (patch)
treebc60827a29151d7829f4b6fdeaa8d6f60e8f8258 /toolsrc/src/main.cpp
parentc494892eb24ce6f84c777f24dfceb71a4988fd24 (diff)
parent23f187a45766057ef76baba9dc912270b403cb7d (diff)
downloadvcpkg-9e1d40e4dc313de2e6de0ac4f60a2df224215ae2.tar.gz
vcpkg-9e1d40e4dc313de2e6de0ac4f60a2df224215ae2.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg
Diffstat (limited to 'toolsrc/src/main.cpp')
-rw-r--r--toolsrc/src/main.cpp2
1 files changed, 1 insertions, 1 deletions
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)
{