From e16084cc8d15b0c042871b0d1cffa6320a1681d4 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 16 Feb 2017 16:32:14 -0800
Subject: Rename Stopwatch.h/cpp to vcpkg_Chrono.h/cpp

---
 toolsrc/include/Stopwatch.h               |  59 ---------------
 toolsrc/include/vcpkg_Chrono.h            |  59 +++++++++++++++
 toolsrc/src/Stopwatch.cpp                 | 119 ------------------------------
 toolsrc/src/commands_ci.cpp               |   2 +-
 toolsrc/src/vcpkg_Chrono.cpp              | 119 ++++++++++++++++++++++++++++++
 toolsrc/vcpkglib/vcpkglib.vcxproj         |   4 +-
 toolsrc/vcpkglib/vcpkglib.vcxproj.filters |  12 +--
 7 files changed, 187 insertions(+), 187 deletions(-)
 delete mode 100644 toolsrc/include/Stopwatch.h
 create mode 100644 toolsrc/include/vcpkg_Chrono.h
 delete mode 100644 toolsrc/src/Stopwatch.cpp
 create mode 100644 toolsrc/src/vcpkg_Chrono.cpp

diff --git a/toolsrc/include/Stopwatch.h b/toolsrc/include/Stopwatch.h
deleted file mode 100644
index e4ae121b3..000000000
--- a/toolsrc/include/Stopwatch.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <string>
-
-namespace vcpkg
-{
-    class ElapsedTime
-    {
-    public:
-        static ElapsedTime createStarted();
-
-        constexpr ElapsedTime() :m_startTick() {}
-
-        template <class TimeUnit>
-        TimeUnit elapsed() const
-        {
-            return std::chrono::duration_cast<TimeUnit>(std::chrono::high_resolution_clock::now() - this->m_startTick);
-        }
-
-        std::string toString() const;
-
-    private:
-        std::chrono::steady_clock::time_point m_startTick;
-    };
-
-    class Stopwatch
-    {
-    public:
-        static Stopwatch createUnstarted();
-
-        static Stopwatch createStarted();
-
-        bool isRunning() const;
-
-        const Stopwatch& start();
-
-        const Stopwatch& stop();
-
-        Stopwatch& reset();
-
-        template <class TimeUnit>
-        TimeUnit elapsed() const
-        {
-            return std::chrono::duration_cast<TimeUnit>(elapsedNanos());
-        }
-
-        std::string toString() const;
-
-    private:
-        Stopwatch();
-
-        std::chrono::nanoseconds elapsedNanos() const;
-
-        bool m_isRunning;
-        std::chrono::nanoseconds m_elapsedNanos;
-        std::chrono::steady_clock::time_point m_startTick;
-    };
-}
diff --git a/toolsrc/include/vcpkg_Chrono.h b/toolsrc/include/vcpkg_Chrono.h
new file mode 100644
index 000000000..e4ae121b3
--- /dev/null
+++ b/toolsrc/include/vcpkg_Chrono.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <chrono>
+#include <string>
+
+namespace vcpkg
+{
+    class ElapsedTime
+    {
+    public:
+        static ElapsedTime createStarted();
+
+        constexpr ElapsedTime() :m_startTick() {}
+
+        template <class TimeUnit>
+        TimeUnit elapsed() const
+        {
+            return std::chrono::duration_cast<TimeUnit>(std::chrono::high_resolution_clock::now() - this->m_startTick);
+        }
+
+        std::string toString() const;
+
+    private:
+        std::chrono::steady_clock::time_point m_startTick;
+    };
+
+    class Stopwatch
+    {
+    public:
+        static Stopwatch createUnstarted();
+
+        static Stopwatch createStarted();
+
+        bool isRunning() const;
+
+        const Stopwatch& start();
+
+        const Stopwatch& stop();
+
+        Stopwatch& reset();
+
+        template <class TimeUnit>
+        TimeUnit elapsed() const
+        {
+            return std::chrono::duration_cast<TimeUnit>(elapsedNanos());
+        }
+
+        std::string toString() const;
+
+    private:
+        Stopwatch();
+
+        std::chrono::nanoseconds elapsedNanos() const;
+
+        bool m_isRunning;
+        std::chrono::nanoseconds m_elapsedNanos;
+        std::chrono::steady_clock::time_point m_startTick;
+    };
+}
diff --git a/toolsrc/src/Stopwatch.cpp b/toolsrc/src/Stopwatch.cpp
deleted file mode 100644
index 4f227bb7c..000000000
--- a/toolsrc/src/Stopwatch.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "pch.h"
-#include "Stopwatch.h"
-#include "vcpkg_Checks.h"
-
-namespace vcpkg
-{
-    static std::string format_time_userfriendly(const std::chrono::nanoseconds& nanos)
-    {
-        using std::chrono::hours;
-        using std::chrono::minutes;
-        using std::chrono::seconds;
-        using std::chrono::milliseconds;
-        using std::chrono::microseconds;
-        using std::chrono::nanoseconds;
-        using std::chrono::duration_cast;
-
-        const double nanos_as_double = static_cast<double>(nanos.count());
-
-        if (duration_cast<hours>(nanos) > hours())
-        {
-            auto t = nanos_as_double / duration_cast<nanoseconds>(hours(1)).count();
-            return Strings::format("%.4g h", t);
-        }
-
-        if (duration_cast<minutes>(nanos) > minutes())
-        {
-            auto t = nanos_as_double / duration_cast<nanoseconds>(minutes(1)).count();
-            return Strings::format("%.4g min", t);
-        }
-
-        if (duration_cast<seconds>(nanos) > seconds())
-        {
-            auto t = nanos_as_double / duration_cast<nanoseconds>(seconds(1)).count();
-            return Strings::format("%.4g s", t);
-        }
-
-        if (duration_cast<milliseconds>(nanos) > milliseconds())
-        {
-            auto t = nanos_as_double / duration_cast<nanoseconds>(milliseconds(1)).count();
-            return Strings::format("%.4g ms", t);
-        }
-
-        if (duration_cast<microseconds>(nanos) > microseconds())
-        {
-            auto t = nanos_as_double / duration_cast<nanoseconds>(microseconds(1)).count();
-            return Strings::format("%.4g us", t);
-        }
-
-        return Strings::format("%.4g ns", nanos_as_double);
-    }
-
-    ElapsedTime ElapsedTime::createStarted()
-    {
-        ElapsedTime t;
-        t.m_startTick = std::chrono::high_resolution_clock::now();
-        return t;
-    }
-
-    std::string ElapsedTime::toString() const
-    {
-        return format_time_userfriendly(elapsed<std::chrono::nanoseconds>());
-    }
-
-    Stopwatch Stopwatch::createUnstarted()
-    {
-        return Stopwatch();
-    }
-
-    Stopwatch Stopwatch::createStarted()
-    {
-        return Stopwatch().start();
-    }
-
-    bool Stopwatch::isRunning() const
-    {
-        return this->m_isRunning;
-    }
-
-    const Stopwatch& Stopwatch::start()
-    {
-        Checks::check_exit(!this->m_isRunning, "This stopwatch is already running.");
-        this->m_isRunning = true;
-        this->m_startTick = std::chrono::high_resolution_clock::now();
-        return *this;
-    }
-
-    const Stopwatch& Stopwatch::stop()
-    {
-        auto tick = std::chrono::high_resolution_clock::now();
-        Checks::check_exit(this->m_isRunning, "This stopwatch is already stopped.");
-        this->m_isRunning = false;
-        this->m_elapsedNanos += tick - this->m_startTick;
-        return *this;
-    }
-
-    Stopwatch& Stopwatch::reset()
-    {
-        this->m_elapsedNanos = std::chrono::nanoseconds();
-        this->m_isRunning = false;
-        return *this;
-    }
-
-    std::string Stopwatch::toString() const
-    {
-        return format_time_userfriendly(this->elapsedNanos());
-    }
-
-    Stopwatch::Stopwatch() : m_isRunning(false), m_elapsedNanos(0), m_startTick() { }
-
-    std::chrono::nanoseconds Stopwatch::elapsedNanos() const
-    {
-        if (this->m_isRunning)
-        {
-            return std::chrono::high_resolution_clock::now() - this->m_startTick + this->m_elapsedNanos;
-        }
-
-        return this->m_elapsedNanos;
-    }
-}
diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp
index f207eeaaa..ea2c707c7 100644
--- a/toolsrc/src/commands_ci.cpp
+++ b/toolsrc/src/commands_ci.cpp
@@ -6,7 +6,7 @@
 #include "vcpkg_System.h"
 #include "vcpkg_Dependencies.h"
 #include "vcpkg_Input.h"
-#include "Stopwatch.h"
+#include "vcpkg_Chrono.h"
 
 namespace vcpkg::Commands::CI
 {
diff --git a/toolsrc/src/vcpkg_Chrono.cpp b/toolsrc/src/vcpkg_Chrono.cpp
new file mode 100644
index 000000000..1bcb439be
--- /dev/null
+++ b/toolsrc/src/vcpkg_Chrono.cpp
@@ -0,0 +1,119 @@
+#include "pch.h"
+#include "vcpkg_Chrono.h"
+#include "vcpkg_Checks.h"
+
+namespace vcpkg
+{
+    static std::string format_time_userfriendly(const std::chrono::nanoseconds& nanos)
+    {
+        using std::chrono::hours;
+        using std::chrono::minutes;
+        using std::chrono::seconds;
+        using std::chrono::milliseconds;
+        using std::chrono::microseconds;
+        using std::chrono::nanoseconds;
+        using std::chrono::duration_cast;
+
+        const double nanos_as_double = static_cast<double>(nanos.count());
+
+        if (duration_cast<hours>(nanos) > hours())
+        {
+            auto t = nanos_as_double / duration_cast<nanoseconds>(hours(1)).count();
+            return Strings::format("%.4g h", t);
+        }
+
+        if (duration_cast<minutes>(nanos) > minutes())
+        {
+            auto t = nanos_as_double / duration_cast<nanoseconds>(minutes(1)).count();
+            return Strings::format("%.4g min", t);
+        }
+
+        if (duration_cast<seconds>(nanos) > seconds())
+        {
+            auto t = nanos_as_double / duration_cast<nanoseconds>(seconds(1)).count();
+            return Strings::format("%.4g s", t);
+        }
+
+        if (duration_cast<milliseconds>(nanos) > milliseconds())
+        {
+            auto t = nanos_as_double / duration_cast<nanoseconds>(milliseconds(1)).count();
+            return Strings::format("%.4g ms", t);
+        }
+
+        if (duration_cast<microseconds>(nanos) > microseconds())
+        {
+            auto t = nanos_as_double / duration_cast<nanoseconds>(microseconds(1)).count();
+            return Strings::format("%.4g us", t);
+        }
+
+        return Strings::format("%.4g ns", nanos_as_double);
+    }
+
+    ElapsedTime ElapsedTime::createStarted()
+    {
+        ElapsedTime t;
+        t.m_startTick = std::chrono::high_resolution_clock::now();
+        return t;
+    }
+
+    std::string ElapsedTime::toString() const
+    {
+        return format_time_userfriendly(elapsed<std::chrono::nanoseconds>());
+    }
+
+    Stopwatch Stopwatch::createUnstarted()
+    {
+        return Stopwatch();
+    }
+
+    Stopwatch Stopwatch::createStarted()
+    {
+        return Stopwatch().start();
+    }
+
+    bool Stopwatch::isRunning() const
+    {
+        return this->m_isRunning;
+    }
+
+    const Stopwatch& Stopwatch::start()
+    {
+        Checks::check_exit(!this->m_isRunning, "This stopwatch is already running.");
+        this->m_isRunning = true;
+        this->m_startTick = std::chrono::high_resolution_clock::now();
+        return *this;
+    }
+
+    const Stopwatch& Stopwatch::stop()
+    {
+        auto tick = std::chrono::high_resolution_clock::now();
+        Checks::check_exit(this->m_isRunning, "This stopwatch is already stopped.");
+        this->m_isRunning = false;
+        this->m_elapsedNanos += tick - this->m_startTick;
+        return *this;
+    }
+
+    Stopwatch& Stopwatch::reset()
+    {
+        this->m_elapsedNanos = std::chrono::nanoseconds();
+        this->m_isRunning = false;
+        return *this;
+    }
+
+    std::string Stopwatch::toString() const
+    {
+        return format_time_userfriendly(this->elapsedNanos());
+    }
+
+    Stopwatch::Stopwatch() : m_isRunning(false), m_elapsedNanos(0), m_startTick() { }
+
+    std::chrono::nanoseconds Stopwatch::elapsedNanos() const
+    {
+        if (this->m_isRunning)
+        {
+            return std::chrono::high_resolution_clock::now() - this->m_startTick + this->m_elapsedNanos;
+        }
+
+        return this->m_elapsedNanos;
+    }
+}
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj
index e01ba925c..4c98380fa 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj
@@ -157,7 +157,7 @@
     <ClInclude Include="..\include\SourceParagraph.h" />
     <ClInclude Include="..\include\StatusParagraph.h" />
     <ClInclude Include="..\include\StatusParagraphs.h" />
-    <ClInclude Include="..\include\Stopwatch.h" />
+    <ClInclude Include="..\include\vcpkg_Chrono.h" />
     <ClInclude Include="..\include\triplet.h" />
     <ClInclude Include="..\include\vcpkglib.h" />
     <ClInclude Include="..\include\vcpkglib_helpers.h" />
@@ -216,7 +216,7 @@
     <ClCompile Include="..\src\PostBuildLint_ConfigurationType.cpp" />
     <ClCompile Include="..\src\PostBuildLint_LinkageType.cpp" />
     <ClCompile Include="..\src\PostBuildLint_BuildType.cpp" />
-    <ClCompile Include="..\src\Stopwatch.cpp" />
+    <ClCompile Include="..\src\vcpkg_Chrono.cpp" />
     <ClCompile Include="..\src\vcpkglib.cpp" />
     <ClCompile Include="..\src\package_spec.cpp" />
     <ClCompile Include="..\src\package_spec_parse_result.cpp" />
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
index 622544e3d..70d1b58ac 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
@@ -132,9 +132,6 @@
     <ClCompile Include="..\src\vcpkg_System.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Stopwatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\vcpkg_Checks.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -174,6 +171,9 @@
     <ClCompile Include="..\src\commands_ci.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\vcpkg_Chrono.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\package_spec.h">
@@ -248,9 +248,6 @@
     <ClInclude Include="..\include\opt_bool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\Stopwatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\vcpkg_Checks.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -299,5 +296,8 @@
     <ClInclude Include="..\include\vcpkg_Enums.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\vcpkg_Chrono.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3