Delete instead of hide copy constructor/assignment in semaphore

+ some const/constexpr

Author: mrotteveel

src/common/classes/semaphore.cpp

@@ -80,10 +80,10 @@ namespace Firebird {
 			system_call_failed::raise("CloseHandle");
 	}
 
-	bool Semaphore::tryEnter(const int seconds , int milliseconds)
+	bool Semaphore::tryEnter(const int seconds, int milliseconds)
 	{
 		milliseconds += seconds * 1000;
-		DWORD result = WaitForSingleObject(hSemaphore, milliseconds >= 0 ? milliseconds : INFINITE);
+		const DWORD result = WaitForSingleObject(hSemaphore, milliseconds >= 0 ? milliseconds : INFINITE);
 		if (result == WAIT_FAILED)
 			system_call_failed::raise("WaitForSingleObject");
 		return result != WAIT_TIMEOUT;
@@ -119,7 +119,7 @@ namespace Firebird {
 #ifdef COMMON_CLASSES_SEMAPHORE_POSIX_RT
 
 #ifndef WORKING_SEM_INIT
-static const char* semName = "/firebird_temp_sem";
+static constexpr const char* semName = "/firebird_temp_sem";
 #endif
 
 #ifndef SEM_FAILED

src/common/classes/semaphore.h

@@ -53,16 +53,16 @@ class Semaphore
 	HANDLE hSemaphore;
 	void init();
 
-	// Forbid copying (there is no definition of these methods)
-	Semaphore(const Semaphore&);
-	Semaphore& operator=(const Semaphore&);
-
 public:
 	Semaphore() { init(); }
 	explicit Semaphore(MemoryPool&) { init(); }
 
 	~Semaphore();
 
+	// Forbid copying
+	Semaphore(const Semaphore&) = delete;
+	Semaphore& operator=(const Semaphore&) = delete;
+
 #define CLASSES_SEMAPHORE_H_HAS_TRYENTER 1
 	bool tryEnter(const int seconds = 0, int milliseconds = 0);
 
@@ -96,16 +96,16 @@ class SignalSafeSemaphore
 
 	void init();
 
-	// Forbid copying
-	SignalSafeSemaphore(const SignalSafeSemaphore&);
-	SignalSafeSemaphore& operator=(const SignalSafeSemaphore&);
-
 public:
 	SignalSafeSemaphore() { init(); }
 	explicit SignalSafeSemaphore(MemoryPool&) { init(); }
 
 	~SignalSafeSemaphore();
 
+	// Forbid copying
+	SignalSafeSemaphore(const SignalSafeSemaphore&) = delete;
+	SignalSafeSemaphore& operator=(const SignalSafeSemaphore&) = delete;
+
 	void enter()
 	{
 		dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
@@ -148,15 +148,16 @@ class SignalSafeSemaphore
 
 	void init();
 
-	// Forbid copying
-	SignalSafeSemaphore(const SignalSafeSemaphore&);
-	SignalSafeSemaphore& operator=(const SignalSafeSemaphore&);
-
 public:
 	SignalSafeSemaphore() { init(); }
 	explicit SignalSafeSemaphore(MemoryPool&) { init(); }
 
 	~SignalSafeSemaphore();
+
+	// Forbid copying
+	SignalSafeSemaphore(const SignalSafeSemaphore&) = delete;
+	SignalSafeSemaphore& operator=(const SignalSafeSemaphore&) = delete;
+
 	void enter();
 
 	void release(SLONG count = 1)
@@ -218,16 +219,16 @@ class Semaphore
 	void mtxLock();
 	void mtxUnlock();
 
-	// Forbid copying
-	Semaphore(const Semaphore&);
-	Semaphore& operator=(const Semaphore&);
-
 public:
 	Semaphore() { init(); }
 	explicit Semaphore(MemoryPool&) { init(); }
 
 	~Semaphore();
 
+	// Forbid copying
+	Semaphore(const Semaphore&) = delete;
+	Semaphore& operator=(const Semaphore&) = delete;
+
 	bool tryEnter(const int seconds = 0, int milliseconds = 0);
 	void enter();
 	void release(SLONG count = 1);