From 6b123d4bc61c2db8e379dd5e681834c4053e661d Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Thu, 22 Aug 2024 10:26:43 +0100
Subject: Use C++20 <format> instead of fmtlib when available.

---
 src/users.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/users.cpp')

diff --git a/src/users.cpp b/src/users.cpp
index f3996f702..3268e5b58 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -125,7 +125,7 @@ const std::string& User::GetUserAddress()
 {
 	if (cached_useraddress.empty())
 	{
-		cached_useraddress = fmt::format("{}@{}", GetRealUser(), GetAddress());
+		cached_useraddress = FMT::format("{}@{}", GetRealUser(), GetAddress());
 		cached_useraddress.shrink_to_fit();
 	}
 
@@ -135,7 +135,7 @@ const std::string& User::GetUserHost()
 {
 	if (cached_userhost.empty())
 	{
-		cached_userhost = fmt::format("{}@{}", GetDisplayedUser(), GetDisplayedHost());
+		cached_userhost = FMT::format("{}@{}", GetDisplayedUser(), GetDisplayedHost());
 		cached_userhost.shrink_to_fit();
 	}
 
@@ -146,7 +146,7 @@ const std::string& User::GetRealUserHost()
 {
 	if (cached_realuserhost.empty())
 	{
-		cached_realuserhost = fmt::format("{}@{}", GetRealUser(), GetRealHost());
+		cached_realuserhost = FMT::format("{}@{}", GetRealUser(), GetRealHost());
 		cached_realuserhost.shrink_to_fit();
 	}
 
@@ -157,7 +157,7 @@ const std::string& User::GetMask()
 {
 	if (cached_mask.empty())
 	{
-		cached_mask = fmt::format("{}!{}@{}", nick, GetDisplayedUser(), GetDisplayedHost());
+		cached_mask = FMT::format("{}!{}@{}", nick, GetDisplayedUser(), GetDisplayedHost());
 		cached_mask.shrink_to_fit();
 	}
 
@@ -168,7 +168,7 @@ const std::string& User::GetRealMask()
 {
 	if (cached_realmask.empty())
 	{
-		cached_realmask = fmt::format("{}!{}@{}", nick, GetRealUser(), GetRealHost());
+		cached_realmask = FMT::format("{}!{}@{}", nick, GetRealUser(), GetRealHost());
 		cached_realmask.shrink_to_fit();
 	}
 
@@ -334,7 +334,7 @@ Cullable::Result User::Cull()
 	if (!quitting)
 	{
 		ServerInstance->Logs.Debug("CULL", "BUG: User {} (@{}) was culled without being quit first!",
-			uuid, fmt::ptr(this));
+			uuid, FMT_PTR(this));
 		ServerInstance->Users.QuitUser(this, "Culled without QuitUser");
 	}
 
-- 
cgit v1.3.1-10-gc9f91