diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-30 08:16:37 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-30 08:16:37 -0800 |
| commit | 1e8bb55f144a61c68e01cefe1b3c15f58b71cd06 (patch) | |
| tree | ca64cf2d7d0a1847565f9c925f51a60f45b9fd81 /toolsrc/src/vcpkg.cpp | |
| parent | 9c78c77f473340f4c49f0fa77b54365d0e99efd7 (diff) | |
| parent | d38d4a75408e0e9d0820187b16da2e06ce0ee316 (diff) | |
| download | vcpkg-1e8bb55f144a61c68e01cefe1b3c15f58b71cd06.tar.gz vcpkg-1e8bb55f144a61c68e01cefe1b3c15f58b71cd06.zip | |
Merge branch 'xunit'
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 5642f937c..04d44c414 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -255,7 +255,7 @@ int main(const int argc, const char* const* const argv) { if (argc == 0) std::abort(); - *GlobalState::timer.lock() = Chrono::ElapsedTime::create_started(); + *GlobalState::timer.lock() = Chrono::ElapsedTimer::create_started(); #if defined(_WIN32) GlobalState::g_init_console_cp = GetConsoleCP(); |