Imported Upstream version 1.57.0

[platform/upstream/boost.git] / libs / context / performance / cycle_i386.hpp

diff --git a/libs/context/performance/cycle_i386.hpp b/libs/context/performance/cycle_i386.hpp
index 3e67007..a3eb703 100644 (file)
--- a/libs/context/performance/cycle_i386.hpp
+++ b/libs/context/performance/cycle_i386.hpp
@@ -18,13 +18,13 @@
 
 #define BOOST_CONTEXT_CYCLE
 
-typedef boost::uint64_t cycle_t;
+typedef boost::uint64_t cycle_type;
 
 #if _MSC_VER
 inline
-cycle_t cycles()
+cycle_type cycles()
 {
-    cycle_t c;
+    cycle_type c;
     __asm {
         cpuid 
         rdtsc
@@ -36,7 +36,7 @@ cycle_t cycles()
 #elif defined(__GNUC__) || \
       defined(__INTEL_COMPILER) || defined(__ICC) || defined(_ECC) || defined(__ICL)
 inline
-cycle_t cycles()
+cycle_type cycles()
 {
     boost::uint32_t lo, hi;
 
@@ -52,30 +52,30 @@ cycle_t cycles()
         ::: "%eax", "%ebx", "%ecx", "%edx"
     );
 
-    return ( cycle_t)hi << 32 | lo; 
+    return ( cycle_type)hi << 32 | lo; 
 }
 #else
 # error "this compiler is not supported"
 #endif
 
-struct measure_cycles
+struct cycle_overhead
 {
-    cycle_t operator()()
+    cycle_type operator()()
     {
-        cycle_t start( cycles() );
+        cycle_type start( cycles() );
         return cycles() - start;
     }
 };
 
 inline
-cycle_t overhead_cycles()
+cycle_type overhead_cycle()
 {
     std::size_t iterations( 10);
-    std::vector< cycle_t >  overhead( iterations, 0);
+    std::vector< cycle_type >  overhead( iterations, 0);
     for ( std::size_t i( 0); i < iterations; ++i)
         std::generate(
             overhead.begin(), overhead.end(),
-            measure_cycles() );
+            cycle_overhead() );
     BOOST_ASSERT( overhead.begin() != overhead.end() );
     return std::accumulate( overhead.begin(), overhead.end(), 0) / iterations;
 }