Changeset 9fe2fd7 in mainline for uspace/lib/cpp/include/__bits/chrono.hpp

Timestamp:

2019-07-24T11:44:40Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a448937, f42ee6f

Parents:

9fb280c (diff), 8c0b781 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jaroslav Jindrak <Dzejrou@…> (2019-07-24 11:44:40)

git-committer:

GitHub <noreply@…> (2019-07-24 11:44:40)

Message:

Merge pull request #171 from Dzejrou/hackweek

C++ stdlib: <future>

File:

• uspace/lib/cpp/include/__bits/chrono.hpp (modified) (1 diff)

uspace/lib/cpp/include/__bits/chrono.hpp

@@ -331 +331 @@
     {
         using CD = common_type_t<duration<Rep1, Period1>, duration<Rep2, Period2>>;
-        return CD(CD(lhs.count()) + CD(rhs.count()));
+        return CD(CD(lhs).count() + CD(rhs).count());
     }