diff options
| author | Matt Peters <[email protected]> | 2022-01-10 10:57:59 -0700 |
|---|---|---|
| committer | Matt Peters <[email protected]> | 2022-01-10 10:57:59 -0700 |
| commit | 4a12683b27adb31bde9eb8f7df3b9e9cc8ec680a (patch) | |
| tree | c8b2939d400dd4bccae73d2782b15c65d30db19d /zenutil | |
| parent | Add WaitForQuiescence RPC (diff) | |
| parent | Two missing override keywords (diff) | |
| download | zen-wait_for_quiescence.tar.xz zen-wait_for_quiescence.zip | |
Merge branch 'main' into wait_for_quiescencewait_for_quiescence
Diffstat (limited to 'zenutil')
| -rw-r--r-- | zenutil/zenserverprocess.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp index 93886a6b7..fe6236d18 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; @@ -651,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 |