Fix warnings.

Author: asfernandes

src/common/StatusHolder.h

@@ -325,10 +325,10 @@ class LocalStatus : public AutoStorage, public BaseStatus<LocalStatus>
 	}
 
 	static void setVersionError(IStatus* status, const char* interfaceName,
-		unsigned currentVersion, unsigned expectedVersion)
+		uintptr_t currentVersion, unsigned expectedVersion)
 	{
 		BaseStatusWrapper<LocalStatus>::setVersionError(
-			status, interfaceName,currentVersion, expectedVersion);
+			status, interfaceName, currentVersion, expectedVersion);
 	}
 };
 

src/gpre/languages/cob.cpp

@@ -2699,7 +2699,11 @@ static void gen_get_segment( const act* action)
 		names[isc_a_pos], blob->blb_ident,
 		names[isc_a_pos], blob->blb_len_ident,
 		BY_VALUE, blob->blb_seg_length, END_VALUE,
-		BY_REF, names[isc_a_pos], blob->blb_buff_ident, names[isc_status_pos]);
+		BY_REF, names[isc_a_pos], blob->blb_buff_ident
+#ifdef GIVING_SUPPORTED
+		, names[isc_status_pos]
+#endif
+	);
 
 	COB_print_buffer(output_buffer, true);
 
@@ -2872,7 +2876,11 @@ static void gen_put_segment( const act* action)
 		status_vector(action),
 		BY_REF, names[isc_a_pos], blob->blb_ident,
 		BY_VALUE, names[isc_a_pos], blob->blb_len_ident, END_VALUE,
-		BY_REF, names[isc_a_pos], blob->blb_buff_ident, names[isc_status_pos]);
+		BY_REF, names[isc_a_pos], blob->blb_buff_ident
+#ifdef GIVING_SUPPORTED
+		, names[isc_status_pos]
+#endif
+	);
 	COB_print_buffer(output_buffer, true);
 
 	set_sqlcode(action);
@@ -4283,4 +4291,3 @@ static void t_start_auto(const gpre_req* request,
 
 	set_sqlcode(action);
 }
-

src/include/firebird/Interface.h

@@ -229,7 +229,7 @@ namespace Firebird
 		}
 
 		static void setVersionError(IStatus* status, const char* interfaceName,
-			unsigned currentVersion, unsigned expectedVersion)
+			uintptr_t currentVersion, unsigned expectedVersion)
 		{
 			intptr_t codes[] = {
 				isc_arg_gds,

src/lock/tests/LockManagerTest.cpp

@@ -196,19 +196,19 @@ BOOST_AUTO_TEST_CASE(LockUnlockNoWaitTest)
 
 BOOST_AUTO_TEST_CASE(LockUnlockAstTest)
 {
-	struct Lock;
+	struct LocalLock;
 
 	struct ThreadData
 	{
 		std::thread::id threadId;
 		LockManager* lockManager = nullptr;
 		std::mutex localMutex;
-		std::unordered_map<SLONG, std::unique_ptr<Lock>> locks;
+		std::unordered_map<SLONG, std::unique_ptr<LocalLock>> locks;
 		SLONG ownerHandle = 0;
 		bool shutdown = false;
 	};
 
-	struct Lock
+	struct LocalLock
 	{
 		ThreadData* threadData = nullptr;
 		unsigned key = 0;
@@ -232,7 +232,7 @@ BOOST_AUTO_TEST_CASE(LockUnlockAstTest)
 	std::latch latch(THREAD_COUNT);
 
 	static const auto ast = [](void* astArg) -> int {
-		const auto lock = static_cast<Lock*>(astArg);
+		const auto lock = static_cast<LocalLock*>(astArg);
 		const auto threadData = lock->threadData;
 
 		std::lock_guard localMutexGuard(threadData->localMutex);
@@ -273,7 +273,7 @@ BOOST_AUTO_TEST_CASE(LockUnlockAstTest)
 
 			for (unsigned i = 0; i < ITERATION_COUNT; ++i)
 			{
-				auto lock = std::make_unique<Lock>();
+				auto lock = std::make_unique<LocalLock>();
 				lock->threadData = &threadData;
 				lock->key = i;