From 5db0c4ed09630a3dc78fd9bed1fbd37af688f3e3 Mon Sep 17 00:00:00 2001
From: SirLynix <lynix680@gmail.com>
Date: Thu, 1 Feb 2024 12:57:29 +0100
Subject: [PATCH] Core/Time: Fix operator<< with negative values not using
 units

---
 include/Nazara/Core/Time.hpp |  4 ++--
 include/Nazara/Core/Time.inl | 16 ----------------
 src/Nazara/Core/Time.cpp     | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/include/Nazara/Core/Time.hpp b/include/Nazara/Core/Time.hpp
index 78d06ad4e..26138ea1c 100644
--- a/include/Nazara/Core/Time.hpp
+++ b/include/Nazara/Core/Time.hpp
@@ -11,7 +11,7 @@
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Core/Config.hpp>
 #include <chrono>
-#include <ostream>
+#include <iosfwd>
 #include <type_traits>
 
 namespace Nz
@@ -73,7 +73,7 @@ namespace Nz
 			friend constexpr bool operator>(Time lhs, Time rhs);
 			friend constexpr bool operator>=(Time lhs, Time rhs);
 
-			friend inline std::ostream& operator<<(std::ostream& out, Time time);
+			friend NAZARA_CORE_API std::ostream& operator<<(std::ostream& out, Time time);
 
 			friend inline bool Serialize(SerializationContext& context, Time time, TypeTag<Time>);
 			friend inline bool Unserialize(SerializationContext& context, Time* time, TypeTag<Time>);
diff --git a/include/Nazara/Core/Time.inl b/include/Nazara/Core/Time.inl
index 764095a78..3f9eae071 100644
--- a/include/Nazara/Core/Time.inl
+++ b/include/Nazara/Core/Time.inl
@@ -212,22 +212,6 @@ namespace Nz
 		return lhs.m_nanoseconds >= rhs.m_nanoseconds;
 	}
 
-	inline std::ostream& operator<<(std::ostream& out, Time time)
-	{
-		if (time > Time::Second())
-			return out << time.AsSeconds<double>() << "s";
-		else
-		{
-			Int64 ns = time.AsNanoseconds();
-			if (time > Time::Millisecond())
-				return out << ns / 1'000'000.0 << "ms";
-			else if (time > Time::Microsecond())
-				return out << ns / 1'000.0 << "us";
-			else
-				return out << ns << "ns";
-		}
-	}
-
 	inline bool Serialize(SerializationContext& context, Time time, TypeTag<Time>)
 	{
 		if (!Serialize(context, time.m_nanoseconds))
diff --git a/src/Nazara/Core/Time.cpp b/src/Nazara/Core/Time.cpp
index 2804bd0c5..1e526282a 100644
--- a/src/Nazara/Core/Time.cpp
+++ b/src/Nazara/Core/Time.cpp
@@ -3,6 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Time.hpp>
+#include <cstdlib>
+#include <ostream>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
 	#include <Nazara/Core/Win32/TimeImpl.hpp>
@@ -31,6 +33,21 @@ namespace Nz
 		}
 	}
 
+	std::ostream& operator<<(std::ostream& out, Time time)
+	{
+		Int64 ns = time.AsNanoseconds();
+		Int64 nsAbs = std::llabs(ns);
+
+		if (nsAbs > 1'000'000'000)
+			return out << time.AsSeconds<double>() << "s";
+		else if (nsAbs > 1'000'000)
+			return out << ns / 1'000'000.0 << "ms";
+		else if (nsAbs > 1'000)
+			return out << ns / 1'000.0 << "us";
+		else
+			return out << ns << "ns";
+	}
+
 	GetElapsedTimeFunction GetElapsedMilliseconds = PlatformImpl::GetElapsedMillisecondsImpl;
 	GetElapsedTimeFunction GetElapsedNanoseconds = NAZARA_ANONYMOUS_NAMESPACE_PREFIX(GetElapsedNanosecondsFirstRun);
 }