From 08d576e1818193346df12ffa26a3ce2fe8747f7c Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 12 Jan 2020 17:48:54 +0100 Subject: Fix clang build. (nw) --- src/lib/netlist/plib/ptime.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/netlist/plib/ptime.h b/src/lib/netlist/plib/ptime.h index add901db872..df0bac92477 100644 --- a/src/lib/netlist/plib/ptime.h +++ b/src/lib/netlist/plib/ptime.h @@ -42,8 +42,8 @@ namespace plib using internal_type = TYPE; using mult_type = TYPE; - template - friend class ptime; + template + friend struct ptime; constexpr ptime() noexcept : m_time(0) {} @@ -64,7 +64,7 @@ namespace plib // FIXME: check for overflow template constexpr explicit ptime(const ptime &rhs) noexcept - : m_time(rhs.as_raw()) { } + : m_time(rhs.m_time) { } template C14CONSTEXPR ptime &operator+=(const ptime &rhs) noexcept @@ -86,14 +86,14 @@ namespace plib friend constexpr const ptime operator-(const ptime &lhs, const ptime &rhs) noexcept { static_assert(ptime_le, ptime>::value, "Invalid ptime type"); - return ptime(lhs.m_time - rhs.as_raw()); + return ptime(lhs.m_time - rhs.m_time); } template friend constexpr const ptime operator+(const ptime &lhs, const ptime &rhs) noexcept { static_assert(ptime_le, ptime>::value, "Invalid ptime type"); - return ptime(lhs.m_time + rhs.as_raw()); + return ptime(lhs.m_time + rhs.m_time); } friend constexpr const ptime operator*(ptime lhs, const mult_type factor) noexcept @@ -105,7 +105,7 @@ namespace plib friend constexpr mult_type operator/(const ptime lhs, const ptime rhs) noexcept { static_assert(ptime_le, ptime>::value, "Invalid ptime type"); - return static_cast(lhs.m_time / rhs.as_raw()); + return static_cast(lhs.m_time / rhs.m_time); } friend constexpr bool operator<(const ptime lhs, const ptime rhs) noexcept -- cgit v1.2.3