changeset 50906:bc6cfa433862

8206006: Build failed on Windows Reviewed-by: jwilhelm, dcubed Contributed-by: robin.westberg@oracle.com
author jwilhelm
date Fri, 29 Jun 2018 01:09:29 +0200
parents 95aad0c785e4
children 39d27210c627
files test/hotspot/gtest/jfr/test_networkUtilization.cpp
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/gtest/jfr/test_networkUtilization.cpp	Thu Jun 28 10:31:39 2018 -0400
+++ b/test/hotspot/gtest/jfr/test_networkUtilization.cpp	Fri Jun 29 01:09:29 2018 +0200
@@ -61,8 +61,8 @@
     }
   };
 
-  typedef TimeInstant<CounterRepresentation, MockFastUnorderedElapsedCounterSource> JfrTicks;
-  typedef TimeInterval<CounterRepresentation, MockFastUnorderedElapsedCounterSource> JfrTickspan;
+  typedef TimeInstant<CounterRepresentation, MockFastUnorderedElapsedCounterSource> MockJfrTicks;
+  typedef TimeInterval<CounterRepresentation, MockFastUnorderedElapsedCounterSource> MockJfrTickspan;
 
   class MockJfrCheckpointWriter {
   public:
@@ -128,9 +128,9 @@
       committed.push_back(*this);
     }
 
-    void set_starttime(const JfrTicks& time) {}
+    void set_starttime(const MockJfrTicks& time) {}
 
-    void set_endtime(const JfrTicks& time) {}
+    void set_endtime(const MockJfrTicks& time) {}
 
     static const MockEventNetworkUtilization& get_committed(const std::string& name) {
       static MockEventNetworkUtilization placeholder;
@@ -216,6 +216,8 @@
 #define JfrOSInterface MockJfrOSInterface
 #define JfrSerializer MockJfrSerializer
 #define JfrCheckpointWriter MockJfrCheckpointWriter
+#define JfrTicks MockJfrTicks
+#define JfrTickspan MockJfrTickspan
 
 #include "jfr/periodic/jfrNetworkUtilization.hpp"
 #include "jfr/periodic/jfrNetworkUtilization.cpp"
@@ -225,6 +227,8 @@
 #undef JfrOSInterface
 #undef JfrSerializer
 #undef JfrCheckpointWriter
+#undef JfrTicks
+#undef JfrTickspan
 
 } // anonymous namespace