fix: fix linking error on mac (#3270)

* Move the definition of fromDuration from Units.cpp to Units.hpp
GEOS-DEV · Aug 7, 2024 · c914283 · c914283
1 parent 6972791
commit c914283
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/src/coreComponents/common/Units.cpp b/src/coreComponents/common/Units.cpp
@@ -73,25 +73,6 @@ std::ostream & operator<<( std::ostream & os, TimeFormatInfo const & info )
   return os;
 }
 
-
-template< typename DURATION >
-TimeFormatInfo TimeFormatInfo::fromDuration( DURATION const value )
-{
-  using namespace std::chrono;
-
-  auto const totalYears = duration_cast< units::Years >( value );
-  auto const daysOut = duration_cast< units::Days >( value - totalYears );
-  auto const hoursOut = duration_cast< hours >( value - totalYears - daysOut );
-  auto const minutesOut = duration_cast< minutes >( value - totalYears - daysOut - hoursOut );
-  auto const secondsOut = duration_cast< seconds >( value - totalYears - daysOut - hoursOut - minutesOut );
-
-  return TimeFormatInfo( duration< double >( value ).count(), int( totalYears.count() ),
-                         int( daysOut.count() ), int( hoursOut.count() ),
-                         int( minutesOut.count() ), int( secondsOut.count() ) );
-}
-// available specializations
-template TimeFormatInfo TimeFormatInfo::fromDuration< SystemClock::duration >( SystemClock::duration duration );
-
 TimeFormatInfo TimeFormatInfo::fromSeconds( double const seconds )
 {
   double remainingSeconds = seconds < 0.0 ? -seconds : seconds;

diff --git a/src/coreComponents/common/Units.hpp b/src/coreComponents/common/Units.hpp
@@ -270,6 +270,21 @@ struct TimeFormatInfo
   string toSecondsString() const;
 };
 
+template< typename DURATION >
+TimeFormatInfo TimeFormatInfo::fromDuration( DURATION const value )
+{
+  using namespace std::chrono;
+
+  auto const totalYears = duration_cast< units::Years >( value );
+  auto const daysOut = duration_cast< units::Days >( value - totalYears );
+  auto const hoursOut = duration_cast< hours >( value - totalYears - daysOut );
+  auto const minutesOut = duration_cast< minutes >( value - totalYears - daysOut - hoursOut );
+  auto const secondsOut = duration_cast< seconds >( value - totalYears - daysOut - hoursOut - minutesOut );
+
+  return TimeFormatInfo( duration< double >( value ).count(), int( totalYears.count() ),
+                         int( daysOut.count() ), int( hoursOut.count() ),
+                         int( minutesOut.count() ), int( secondsOut.count() ) );
+}
 
 } // end namespace units