Merge pull request #821 from evoskuil/master

evoskuil · web-flow · commit 7e1517e59c2a · 2026-06-08T08:38:08.000-04:00
Delint.
diff --git a/src/config/utilities.cpp b/src/config/utilities.cpp
@@ -86,9 +86,9 @@ std::string to_normal_host(const std::string& host,
     }
 }
 
+#if defined(HAVE_LINUX)
 std::optional<uint64_t> get_memory_setting(std::string name) NOEXCEPT
 {
-#if defined(HAVE_LINUX)
     try
     {
         uint64_t value{};
@@ -101,10 +101,15 @@ std::optional<uint64_t> get_memory_setting(std::string name) NOEXCEPT
     catch (...)
     {
     }
-#endif
 
     return {};
 }
+#else
+std::optional<uint64_t> get_memory_setting(std::string) NOEXCEPT
+{
+    return {};
+}
+#endif
 
 } // namespace config
 } // namespace network

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,9 @@ std::string to_normal_host(const std::string& host,`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
	`89`	`+#if defined(HAVE_LINUX)`
`89`	`90`	`std::optional<uint64_t> get_memory_setting(std::string name) NOEXCEPT`
`90`	`91`	`{`
`91`		`-#if defined(HAVE_LINUX)`
`92`	`92`	`try`
`93`	`93`	`{`
`94`	`94`	`uint64_t value{};`
`@@ -101,10 +101,15 @@ std::optional<uint64_t> get_memory_setting(std::string name) NOEXCEPT`
`101`	`101`	`catch (...)`
`102`	`102`	`{`
`103`	`103`	`}`
`104`		`-#endif`
`105`	`104`
`106`	`105`	`return {};`
`107`	`106`	`}`
	`107`	`+#else`
	`108`	`+std::optional<uint64_t> get_memory_setting(std::string) NOEXCEPT`
	`109`	`+{`
	`110`	`+ return {};`
	`111`	`+}`
	`112`	`+#endif`
`108`	`113`
`109`	`114`	`} // namespace config`
`110`	`115`	`} // namespace network`