From fda662e273eec19339063313492df30b748e127a Mon Sep 17 00:00:00 2001
From: "Marat Iskakov R." <44665373+marat-iskakov@users.noreply.github.com>
Date: Fri, 26 Jul 2024 07:16:11 +0500
Subject: [PATCH] Minor static analysis fixes (#8195)

Co-authored-by: MaratIskakov <maratiskakov@10.0.2.15>
---
 src/common/UtilSvc.h              | 2 +-
 src/common/classes/auto.h         | 2 +-
 src/common/classes/stack.h        | 2 +-
 src/jrd/recsrc/RecordSource.h     | 2 +-
 src/jrd/recsrc/WindowedStream.cpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/UtilSvc.h b/src/common/UtilSvc.h
index 353fb58fab..e3af390791 100644
--- a/src/common/UtilSvc.h
+++ b/src/common/UtilSvc.h
@@ -66,7 +66,7 @@ public:
 			: mutex(nullptr), status(nullptr), uSvc(nullptr)
 		{ }
 
-		StatusAccessor(StatusAccessor&& sa)
+		StatusAccessor(StatusAccessor&& sa) noexcept
 			: mutex(sa.mutex), status(sa.status), uSvc(sa.uSvc)
 		{
 			sa.mutex = nullptr;
diff --git a/src/common/classes/auto.h b/src/common/classes/auto.h
index d77c555d8b..923356fb6a 100644
--- a/src/common/classes/auto.h
+++ b/src/common/classes/auto.h
@@ -125,7 +125,7 @@ public:
 		return *this;
 	}
 
-	AutoPtr& operator=(AutoPtr&& r)
+	AutoPtr& operator=(AutoPtr&& r) noexcept
 	{
 		if (this != &r)
 		{
diff --git a/src/common/classes/stack.h b/src/common/classes/stack.h
index 2407efa982..3d9989a7c4 100644
--- a/src/common/classes/stack.h
+++ b/src/common/classes/stack.h
@@ -406,7 +406,7 @@ namespace Firebird {
 				return !(*this == s);
 			}
 
-			iterator& operator= (iterator& i)
+			iterator& operator= (const iterator& i)
 			{
 				stk = i.stk;
 				elem = i.elem;
diff --git a/src/jrd/recsrc/RecordSource.h b/src/jrd/recsrc/RecordSource.h
index 42378b443f..66e73abf29 100644
--- a/src/jrd/recsrc/RecordSource.h
+++ b/src/jrd/recsrc/RecordSource.h
@@ -1010,7 +1010,7 @@ namespace Jrd
 			}
 
 		private:
-			const void getFrameValue(thread_db* tdbb, Request* request,
+			void getFrameValue(thread_db* tdbb, Request* request,
 				const Frame* frame, impure_value_ex* impureValue) const;
 
 			SINT64 locateFrameRange(thread_db* tdbb, Request* request, Impure* impure,
diff --git a/src/jrd/recsrc/WindowedStream.cpp b/src/jrd/recsrc/WindowedStream.cpp
index 4c172c0a32..0279223dc7 100644
--- a/src/jrd/recsrc/WindowedStream.cpp
+++ b/src/jrd/recsrc/WindowedStream.cpp
@@ -938,7 +938,7 @@ void WindowedStream::WindowStream::nullRecords(thread_db* tdbb) const
 	m_next->nullRecords(tdbb);
 }
 
-const void WindowedStream::WindowStream::getFrameValue(thread_db* tdbb, Request* request,
+void WindowedStream::WindowStream::getFrameValue(thread_db* tdbb, Request* request,
 	const Frame* frame, impure_value_ex* impureValue) const
 {
 	dsc* desc = EVL_expr(tdbb, request, frame->value);