Merge branch '2.3' into 2.4

2020-07-27 14:55:58 +03:00
parent 62082c2a12 ffb237628c
commit ce05b68030
2 changed files with 3 additions and 3 deletions
--- a/maxutils/maxbase/include/maxbase/stopwatch.hh
+++ b/maxutils/maxbase/include/maxbase/stopwatch.hh
@ -60,7 +60,7 @@ struct Duration : public Clock::duration
 *
 *   A std::chrono::time_point to go with Clock and Duration.
 */
-using TimePoint = std::chrono::time_point<Clock, Duration>;
+using TimePoint = std::chrono::steady_clock::time_point;

 /**
 *  @class StopWatch