C++17 switch

nzbgetcom · Jun 19, 2024 · dff5df1 · dff5df1
1 parent 3fb3bbd
commit dff5df1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,8 +11,8 @@ set_property(GLOBAL PROPERTY INCLUDES)
 set(VERSION "24.2")
 set(PACKAGE "nzbget")
 set(PACKAGE_BUGREPORT "https://github.com/nzbgetcom/nzbget/issues")
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_C_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_C_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)

diff --git a/daemon/extension/ExtensionManager.cpp b/daemon/extension/ExtensionManager.cpp
@@ -31,7 +31,7 @@ namespace ExtensionManager
 {
 	const Extensions& Manager::GetExtensions() const &
 	{
-		std::shared_lock<std::shared_timed_mutex> lock{m_mutex};
+		std::shared_lock<std::shared_mutex> lock{m_mutex};
 		return m_extensions;
 	}
 
@@ -58,7 +58,7 @@ namespace ExtensionManager
 	boost::optional<std::string>
 	Manager::UpdateExtension(const std::string& filename, const std::string& extName)
 	{
-		std::unique_lock<std::shared_timed_mutex> lock{m_mutex};
+		std::unique_lock<std::shared_mutex> lock{m_mutex};
 
 		auto extensionIt = GetByName(extName);
 		if (extensionIt == std::end(m_extensions))
@@ -135,7 +135,7 @@ namespace ExtensionManager
 	boost::optional<std::string>
 	Manager::DeleteExtension(const std::string& name)
 	{
-		std::unique_lock<std::shared_timed_mutex> lock{m_mutex};
+		std::unique_lock<std::shared_mutex> lock{m_mutex};
 
 		auto extensionIt = GetByName(name);
 		if (extensionIt == std::end(m_extensions))
@@ -167,7 +167,7 @@ namespace ExtensionManager
 			return std::string("\"ScriptDir\" is not specified");
 		}
 
-		std::unique_lock<std::shared_timed_mutex> lock{m_mutex};
+		std::unique_lock<std::shared_mutex> lock{m_mutex};
 
 		m_extensions.clear();
 

diff --git a/daemon/extension/ExtensionManager.h b/daemon/extension/ExtensionManager.h
@@ -73,7 +73,7 @@ namespace ExtensionManager
 		DeleteExtension(const Extension::Script& ext);
 
 		Extensions m_extensions;
-		mutable std::shared_timed_mutex m_mutex;
+		mutable std::shared_mutex m_mutex;
 	};
 }