Remove unused beast::currentTimeMillis()

XRPLF · Jan 23, 2018 · 0e2a026 · 0e2a026
1 parent eaff9a0
commit 0e2a026
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 98 deletions.
diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj
@@ -1651,11 +1651,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\beast\core\SystemStats.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\beast\core\Time.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\beast\core\Time.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\beast\core\WaitableEvent.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>

diff --git a/Builds/VisualStudio2015/RippleD.vcxproj.filters b/Builds/VisualStudio2015/RippleD.vcxproj.filters
@@ -2283,12 +2283,6 @@
     <ClInclude Include="..\..\src\ripple\beast\core\SystemStats.h">
       <Filter>ripple\beast\core</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\beast\core\Time.cpp">
-      <Filter>ripple\beast\core</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\ripple\beast\core\Time.h">
-      <Filter>ripple\beast\core</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\beast\core\WaitableEvent.cpp">
       <Filter>ripple\beast\core</Filter>
     </ClCompile>

diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp
@@ -38,7 +38,6 @@
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/beast/clock/basic_seconds_clock.h>
 #include <ripple/beast/core/CurrentThreadName.h>
-#include <ripple/beast/core/Time.h>
 #include <ripple/beast/utility/Debug.h>
 
 #include <beast/unit_test/dstream.hpp>
@@ -57,6 +56,10 @@
 #include <utility>
 #include <stdexcept>
 
+#ifdef _MSC_VER
+#include <sys/types.h>
+#include <sys/timeb.h>
+#endif
 
 #if BOOST_VERSION >= 106400
 #define HAS_BOOST_PROCESS 1
@@ -588,11 +591,22 @@ int run (int argc, char** argv)
 //
 int main (int argc, char** argv)
 {
-    // Workaround for Boost.Context / Boost.Coroutine
-    // https://svn.boost.org/trac/boost/ticket/10657
-    (void)beast::currentTimeMillis();
-
 #ifdef _MSC_VER
+    {
+        // Work around for https://svn.boost.org/trac/boost/ticket/10657
+        // Reported against boost version 1.56.0.  If an application's
+        // first call to GetTimeZoneInformation is from a coroutine, an
+        // unhandled exception is generated.  A workaround is to call
+        // GetTimeZoneInformation at least once before launching any
+        // coroutines.  At the time of this writing the _ftime call is
+        // used to initialize the timezone information.
+        struct _timeb t;
+    #ifdef _INC_TIME_INL
+            _ftime_s (&t);
+    #else
+            _ftime (&t);
+    #endif
+    }
     ripple::sha512_deprecatedMSVCWorkaround();
 #endif
 

diff --git a/src/ripple/beast/core/Time.cpp b/src/ripple/beast/core/Time.cpp
diff --git a/src/ripple/beast/core/Time.h b/src/ripple/beast/core/Time.h
diff --git a/src/ripple/beast/core/core.unity.cpp b/src/ripple/beast/core/core.unity.cpp
@@ -193,7 +193,6 @@
 #include <ripple/beast/core/CurrentThreadName.cpp>
 #include <ripple/beast/core/SemanticVersion.cpp>
 #include <ripple/beast/core/SystemStats.cpp>
-#include <ripple/beast/core/Time.cpp>
 #include <ripple/beast/core/WaitableEvent.cpp>
 
 #ifdef _CRTDBG_MAP_ALLOC