noexcept / final in ImplementHelper

Author: mrotteveel

src/common/classes/ImplementHelper.cpp

@@ -46,19 +46,19 @@ Firebird::UnloadDetector myModule;
 namespace Firebird
 {
 
-UnloadDetectorHelper* getUnloadDetector()
+UnloadDetectorHelper* getUnloadDetector() noexcept
 {
 	return &myModule;
 }
 
-void CachedMasterInterface::set(IMaster* master)
+void CachedMasterInterface::set(IMaster* master) noexcept
 {
 	fb_assert(master);
 	fb_assert(!cached);
 	cached = master;
 }
 
-IMaster* CachedMasterInterface::getMasterInterface()
+IMaster* CachedMasterInterface::getMasterInterface() noexcept
 {
 	if (!cached)
 	{
@@ -70,14 +70,14 @@ IMaster* CachedMasterInterface::getMasterInterface()
 unsigned int ConfigKeys::getKey(IFirebirdConf* config, const char* keyName)
 {
 	FbLocalStatus status;
-	unsigned int version = config->getVersion(&status) & 0xFFFF0000;
+	const unsigned int version = config->getVersion(&status) & 0xFFFF0000;
 	for (const_iterator itr = this->begin(); itr != this->end(); ++itr)
 	{
 		if (((*itr) & 0xFFFF0000) == version)
 			return *itr;
 	}
 
-	unsigned int secDbKey = config->getKey(keyName);
+	const unsigned int secDbKey = config->getKey(keyName);
 	if (secDbKey != INVALID_KEY)
 		this->push(secDbKey);
 

src/common/classes/ImplementHelper.h

@@ -53,9 +53,8 @@ class VersionedIface : public C
 public:
 	VersionedIface() { }
 
-private:
-	VersionedIface(const VersionedIface&);
-	VersionedIface& operator=(const VersionedIface&);
+	VersionedIface(const VersionedIface&) = delete;
+	VersionedIface& operator=(const VersionedIface&) = delete;
 };
 
 // Helps to implement versioned interfaces on stack or static
@@ -123,7 +122,7 @@ class RefCntIface : public VersionedIface<C>, public GlobalStorage
 	}
 
 protected:
-	void refCntDPrt(char f)
+	void refCntDPrt(char f) noexcept
 	{
 #ifdef DEV_BUILD
 		if (mark)
@@ -194,27 +193,27 @@ class SimpleFactory : public Static<SimpleFactoryBase<P> >
 class CachedMasterInterface
 {
 public:
-	static void set(IMaster* master);
+	static void set(IMaster* master) noexcept;
 
 protected:
-	static IMaster* getMasterInterface();
+	static IMaster* getMasterInterface() noexcept;
 };
 
 // Base for interface type independent accessors
 template <typename C>
 class AccessAutoInterface : public CachedMasterInterface
 {
 public:
-	explicit AccessAutoInterface(C* aPtr)
+	explicit AccessAutoInterface(C* aPtr) noexcept
 		: ptr(aPtr)
 	{ }
 
-	operator C*()
+	operator C*() noexcept
 	{
 		return ptr;
 	}
 
-	C* operator->()
+	C* operator->() noexcept
 	{
 		return ptr;
 	}
@@ -224,17 +223,17 @@ class AccessAutoInterface : public CachedMasterInterface
 };
 
 // Master interface access
-class MasterInterfacePtr : public AccessAutoInterface<IMaster>
+class MasterInterfacePtr final : public AccessAutoInterface<IMaster>
 {
 public:
-	MasterInterfacePtr()
+	MasterInterfacePtr() noexcept
 		: AccessAutoInterface<IMaster>(getMasterInterface())
 	{ }
 };
 
 
 // Generic plugins interface access
-class PluginManagerInterfacePtr : public AccessAutoInterface<IPluginManager>
+class PluginManagerInterfacePtr final : public AccessAutoInterface<IPluginManager>
 {
 public:
 	PluginManagerInterfacePtr()
@@ -244,7 +243,7 @@ class PluginManagerInterfacePtr : public AccessAutoInterface<IPluginManager>
 
 
 // Control timer interface access
-class TimerInterfacePtr : public AccessAutoInterface<ITimerControl>
+class TimerInterfacePtr final : public AccessAutoInterface<ITimerControl>
 {
 public:
 	TimerInterfacePtr()
@@ -254,7 +253,7 @@ class TimerInterfacePtr : public AccessAutoInterface<ITimerControl>
 
 
 // Distributed transactions coordinator access
-class DtcInterfacePtr : public AccessAutoInterface<IDtc>
+class DtcInterfacePtr final : public AccessAutoInterface<IDtc>
 {
 public:
 	DtcInterfacePtr()
@@ -264,7 +263,7 @@ class DtcInterfacePtr : public AccessAutoInterface<IDtc>
 
 
 // Dispatcher access
-class DispatcherPtr : public AccessAutoInterface<IProvider>
+class DispatcherPtr final : public AccessAutoInterface<IProvider>
 {
 public:
 	DispatcherPtr()
@@ -279,7 +278,7 @@ class DispatcherPtr : public AccessAutoInterface<IProvider>
 
 
 // Misc utl access
-class UtilInterfacePtr : public AccessAutoInterface<IUtil>
+class UtilInterfacePtr final : public AccessAutoInterface<IUtil>
 {
 public:
 	UtilInterfacePtr()
@@ -325,22 +324,22 @@ class UnloadDetectorHelper final :
 		}
 	}
 
-	bool unloadStarted()
+	bool unloadStarted() const noexcept
 	{
 		return !flagOsUnload;
 	}
 
-	void setCleanup(VoidNoParam* function)
+	void setCleanup(VoidNoParam* function) noexcept
 	{
 		cleanup = function;
 	}
 
-	void setThreadDetach(VoidNoParam* function)
+	void setThreadDetach(VoidNoParam* function) noexcept
 	{
 		thdDetach = function;
 	}
 
-	void doClean()
+	void doClean() override
 	{
 		flagOsUnload = false;
 
@@ -351,7 +350,7 @@ class UnloadDetectorHelper final :
 		}
 	}
 
-	void threadDetach()
+	void threadDetach() override
 	{
 		if (thdDetach)
 			thdDetach();
@@ -364,10 +363,10 @@ class UnloadDetectorHelper final :
 };
 
 typedef GlobalPtr<UnloadDetectorHelper, InstanceControl::PRIORITY_DETECT_UNLOAD> UnloadDetector;
-UnloadDetectorHelper* getUnloadDetector();
+UnloadDetectorHelper* getUnloadDetector() noexcept;
 
 // Generic status checker
-inline void check(IStatus* status, ISC_STATUS exclude = 0)
+inline void check(const IStatus* status, ISC_STATUS exclude = 0)
 {
 	if (status->getState() & IStatus::STATE_ERRORS)
 	{
@@ -377,14 +376,14 @@ inline void check(IStatus* status, ISC_STATUS exclude = 0)
 }
 
 // Config keys cache
-class ConfigKeys : private HalfStaticArray<unsigned int, 8>
+class ConfigKeys final : private HalfStaticArray<unsigned int, 8>
 {
 public:
 	ConfigKeys(MemoryPool& p)
 		: HalfStaticArray<unsigned int, 8>(p)
 	{ }
 
-	const static unsigned int INVALID_KEY = ~0u;
+	static constexpr unsigned int INVALID_KEY = ~0u;
 
 	unsigned int getKey(IFirebirdConf* config, const char* keyName);
 };