constexpr + noexcept in mod_loader (windows only)

Author: mrotteveel

src/common/os/mod_loader.h

@@ -72,6 +72,11 @@ class ModuleLoader
 		/// Destructor
 		virtual ~Module() {}
 
+		/// Copy construction is not supported
+		Module(const Module&) = delete;
+		/// assignment of Modules isn't supported
+		const Module& operator=(const Module&) = delete;
+
 		const Firebird::PathName fileName;
 
 	protected:
@@ -82,11 +87,6 @@ class ModuleLoader
 		{
 		}
 
-	private:
-		/// Copy construction is not supported, hence the copy constructor is private
-		Module(const Module&);		// no impl
-		/// assignment of Modules isn't supported so the assignment operator is private
-		const Module& operator=(const Module&);		// no impl
 	};
 
 	/** loadModule is given as a string the path to the module to load.  It

src/common/os/win32/mod_loader.cpp

@@ -39,7 +39,7 @@ template <typename PFN>
 class WinApiFunction
 {
 public:
-	WinApiFunction(const char *dllName, const char *fnName)
+	WinApiFunction(const char *dllName, const char *fnName) noexcept
 	{
 		m_ptr = NULL;
 		const HMODULE hDll = GetModuleHandle(dllName);
@@ -50,21 +50,21 @@ class WinApiFunction
 	~WinApiFunction()
 	{}
 
-	PFN operator* () const { return m_ptr; }
+	PFN operator* () const noexcept { return m_ptr; }
 
-	operator bool() const { return (m_ptr != NULL); }
+	operator bool() const noexcept { return (m_ptr != NULL); }
 
 private:
 	PFN m_ptr;
 };
 
-const char* const KERNEL32_DLL = "kernel32.dll";
+constexpr const char* KERNEL32_DLL = "kernel32.dll";
 
 
 class ContextActivator
 {
 public:
-	ContextActivator() :
+	ContextActivator() noexcept :
 	  mFindActCtxSectionString(KERNEL32_DLL, "FindActCtxSectionStringA"),
 	  mCreateActCtx(KERNEL32_DLL, "CreateActCtxA"),
 	  mReleaseActCtx(KERNEL32_DLL, "ReleaseActCtx"),
@@ -83,11 +83,7 @@ class ContextActivator
 		if (!mCreateActCtx)
 			return;
 
-		ACTCTX_SECTION_KEYED_DATA ackd;
-		memset(&ackd, 0, sizeof(ackd));
-		ackd.cbSize = sizeof(ackd);
-
-		const char* crtDll =
+		constexpr const char* crtDll =
 #if _MSC_VER == 1400
 			"msvcr80.dll";
 #elif _MSC_VER == 1500
@@ -110,6 +106,9 @@ class ContextActivator
 //		#error Specify CRT DLL name here !
 #endif
 
+		ACTCTX_SECTION_KEYED_DATA ackd{};
+		ackd.cbSize = sizeof(ackd);
+
 		// if CRT already present in some activation context then nothing to do
 		if ((*mFindActCtxSectionString)
 				(0, NULL,
@@ -120,8 +119,7 @@ class ContextActivator
 		}
 
 		// create and use activation context from our own manifest
-		ACTCTXA actCtx;
-		memset(&actCtx, 0, sizeof(actCtx));
+		ACTCTXA actCtx{};
 		actCtx.cbSize = sizeof(actCtx);
 		actCtx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID | ACTCTX_FLAG_HMODULE_VALID;
 		actCtx.lpResourceName = ISOLATIONAWARE_MANIFEST_RESOURCE_ID;
@@ -157,7 +155,7 @@ class ContextActivator
 	WinApiFunction<PFN_DAC> mDeactivateActCtx;
 
 	HANDLE		hActCtx;
-	ULONG_PTR	mCookie;
+	ULONG_PTR	mCookie = 0;
 };