[core] Minor code reorganization

srtcore/sync.h

@@ -39,50 +39,8 @@ using namespace std;
 
 #if USE_STDCXX_CHRONO
 
-template <class Clock, class Duration = typename Clock::duration>
-using time_point = chrono::time_point<Clock, Duration>;
-using steady_clock   = chrono::steady_clock;
 template <class Clock>
 using Duration = chrono::duration<Clock>;
-template <class Clock>
-using TimePoint = chrono::time_point<Clock>;
-
-inline long long count_microseconds(const steady_clock::duration &t)
-{
-    return std::chrono::duration_cast<std::chrono::microseconds>(t).count();
-}
-
-inline long long count_microseconds(const steady_clock::time_point tp)
-{
-    return std::chrono::duration_cast<std::chrono::microseconds>(tp.time_since_epoch()).count();
-}
-
-inline long long count_milliseconds(const steady_clock::duration &t)
-{
-    return std::chrono::duration_cast<std::chrono::milliseconds>(t).count();
-}
-
-inline long long count_seconds(const steady_clock::duration &t)
-{
-    return std::chrono::duration_cast<std::chrono::seconds>(t).count();
-}
-
-inline steady_clock::duration microseconds_from(long t_us) { return std::chrono::microseconds(t_us); }
-
-inline steady_clock::duration milliseconds_from(long t_ms) { return std::chrono::milliseconds(t_ms); }
-
-inline steady_clock::duration seconds_from(long t_s) { return std::chrono::seconds(t_s); }
-
-template <class Clock, class Duration = typename Clock::duration>
-inline bool is_zero(const time_point<Clock, Duration> &tp)
-{
-    return tp.time_since_epoch() == Clock::duration::zero();
-}
-
-inline bool is_zero(const steady_clock::time_point& t)
-{
-    return t == steady_clock::time_point();
-}
 
 #else
 
@@ -130,12 +88,36 @@ class Duration
     int64_t m_duration;
 };
 
+#endif // USE_STDCXX_CHRONO
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 // TimePoint and steadt_clock classes
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#if USE_STDCXX_CHRONO
+
+using steady_clock = chrono::steady_clock;
+
+template <class Clock, class Duration = typename Clock::duration>
+using time_point = chrono::time_point<Clock, Duration>;
+
+template <class Clock>
+using TimePoint = chrono::time_point<Clock>;
+
+template <class Clock, class Duration = typename Clock::duration>
+inline bool is_zero(const time_point<Clock, Duration> &tp)
+{
+    return tp.time_since_epoch() == Clock::duration::zero();
+}
+
+inline bool is_zero(const steady_clock::time_point& t)
+{
+    return t == steady_clock::time_point();
+}
+
+#else
 template <class _Clock>
 class TimePoint;
 
@@ -216,6 +198,9 @@ class TimePoint
     uint64_t m_timestamp;
 };
 
+template <>
+uint64_t srt::sync::TimePoint<srt::sync::steady_clock>::us_since_epoch() const;
+
 template <>
 srt::sync::Duration<srt::sync::steady_clock> srt::sync::TimePoint<srt::sync::steady_clock>::time_since_epoch() const;
 
@@ -224,6 +209,58 @@ inline Duration<steady_clock> operator*(const int& lhs, const Duration<steady_cl
     return rhs * lhs;
 }
 
+#endif // USE_STDCXX_CHRONO
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Duration and timepoint conversions
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#if USE_STDCXX_CHRONO
+
+inline long long count_microseconds(const steady_clock::duration &t)
+{
+    return std::chrono::duration_cast<std::chrono::microseconds>(t).count();
+}
+
+inline long long count_microseconds(const steady_clock::time_point tp)
+{
+    return std::chrono::duration_cast<std::chrono::microseconds>(tp.time_since_epoch()).count();
+}
+
+inline long long count_milliseconds(const steady_clock::duration &t)
+{
+    return std::chrono::duration_cast<std::chrono::milliseconds>(t).count();
+}
+
+inline long long count_seconds(const steady_clock::duration &t)
+{
+    return std::chrono::duration_cast<std::chrono::seconds>(t).count();
+}
+
+inline steady_clock::duration microseconds_from(long t_us)
+{
+    return std::chrono::microseconds(t_us);
+}
+
+inline steady_clock::duration milliseconds_from(long t_ms)
+{
+    return std::chrono::milliseconds(t_ms);
+}
+
+inline steady_clock::duration seconds_from(long t_s)
+{
+    return std::chrono::seconds(t_s);
+}
+
+#else
+
+inline int64_t count_microseconds(const TimePoint<steady_clock> tp)
+{
+    return static_cast<int64_t>(tp.us_since_epoch());
+}
+
 int64_t count_microseconds(const steady_clock::duration& t);
 int64_t count_milliseconds(const steady_clock::duration& t);
 int64_t count_seconds(const steady_clock::duration& t);
@@ -237,6 +274,8 @@ inline bool is_zero(const TimePoint<steady_clock>& t)
     return t == TimePoint<steady_clock>();
 }
 
+#endif // USE_STDCXX_CHRONO
+
 
 ///////////////////////////////////////////////////////////////////////////////
 //