fix Time operators

Author: jube

include/gf2/core/Namegen.h

@@ -49,7 +49,7 @@ namespace gf {
 
   };
 
-  struct NamegenSettings {
+  struct GF_CORE_API NamegenSettings {
     std::size_t min_length = 0;
     std::size_t max_length = std::numeric_limits<std::size_t>::max();
     std::string starts_with;

include/gf2/core/Time.h

@@ -142,24 +142,24 @@ namespace gf {
     return Time(lhs.as_duration() - rhs.as_duration());
   }
 
-  template<typename T>
-  constexpr Time operator*(Time lhs, std::enable_if_t<std::is_arithmetic_v<T>, T> rhs)
+  template<typename T, std::enable_if_t<std::is_arithmetic_v<T>, bool> = true>
+  constexpr Time operator*(Time lhs, T rhs)
   {
-    auto duration = lhs * rhs;
+    auto duration = lhs.as_duration() * rhs;
     return Time(std::chrono::duration_cast<details::DurationType>(duration));
   }
 
-  template<typename T>
-  constexpr Time operator*(std::enable_if_t<std::is_arithmetic_v<T>, T> lhs, Time rhs)
+  template<typename T, std::enable_if_t<std::is_arithmetic_v<T>, bool> = true>
+  constexpr Time operator*(T lhs, Time rhs)
   {
-    auto duration = lhs * rhs;
+    auto duration = lhs * rhs.as_duration();
     return Time(std::chrono::duration_cast<details::DurationType>(duration));
   }
 
-  template<typename T>
-  constexpr Time operator/(Time lhs, std::enable_if_t<std::is_arithmetic_v<T>, T> rhs)
+  template<typename T, std::enable_if_t<std::is_arithmetic_v<T>, bool> = true>
+  constexpr Time operator/(Time lhs, T rhs)
   {
-    auto duration = lhs / rhs;
+    auto duration = lhs.as_duration() / rhs;
     return Time(std::chrono::duration_cast<details::DurationType>(duration));
   }
 

library/core/Namegen.cc

@@ -198,9 +198,10 @@ namespace gf {
   std::vector<std::string> NamegenManager::generate_multiple(Random& random, std::size_t count, Time max_time_per_name, const NamegenSettings& settings) const
   {
     std::vector<std::string> names;
+    const Time max_time = count * max_time_per_name;
     Clock clock;
 
-    while (names.size() < count && clock.restart() < max_time_per_name) {
+    while (names.size() < count && clock.elapsed_time() < max_time) {
       if (auto maybe_name = generate_single(random, settings); maybe_name) {
         names.push_back(std::move(maybe_name).value());
       }