From fa86dbd4af6ff50fe21f909727676e2867f0b168 Mon Sep 17 00:00:00 2001
From: Martin Ridgers <martin.ridgers@epicgames.com>
Date: Fri, 7 Jan 2022 14:41:45 +0100
Subject: Turn all ThrowLastError() sites in source_location variants

---
 zenutil/zenserverprocess.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'zenutil/zenserverprocess.cpp')

diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp
index 93886a6b7..8eb510bb5 100644
--- a/zenutil/zenserverprocess.cpp
+++ b/zenutil/zenserverprocess.cpp
@@ -11,7 +11,6 @@
 #include <zencore/thread.h>
 
 #include <atomic>
-#include <source_location>
 
 #if ZEN_PLATFORM_WINDOWS
 #	include <atlbase.h>
@@ -52,7 +51,7 @@ namespace zenutil {
 			{
 				if (!SetSecurityDescriptorDacl(&m_Sd, TRUE, (PACL)NULL, FALSE))
 				{
-					ThrowLastError("SetSecurityDescriptorDacl failed", std::source_location::current());
+					ThrowLastError("SetSecurityDescriptorDacl failed");
 				}
 
 				m_Attributes.lpSecurityDescriptor = &m_Sd;
-- 
cgit v1.2.3


From 9086231f3923c0df6d9ef817441bfae5e134e8ff Mon Sep 17 00:00:00 2001
From: Martin Ridgers <martin.ridgers@epicgames.com>
Date: Mon, 10 Jan 2022 12:07:03 +0100
Subject: Converted use of _format UDL to fmt::format

---
 zenutil/zenserverprocess.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'zenutil/zenserverprocess.cpp')

diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp
index 8eb510bb5..fe6236d18 100644
--- a/zenutil/zenserverprocess.cpp
+++ b/zenutil/zenserverprocess.cpp
@@ -650,9 +650,7 @@ ZenServerInstance::GetBaseUri() const
 {
 	ZEN_ASSERT(m_BasePort);
 
-	using namespace fmt::literals;
-
-	return "http://localhost:{}"_format(m_BasePort);
+	return fmt::format("http://localhost:{}", m_BasePort);
 }
 
 }  // namespace zen
-- 
cgit v1.2.3