From f9418a7daf6541d02628210f53fbc377f582053e Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Tue, 12 Dec 2023 17:43:15 +0200
Subject: [PATCH 01/15] Fix rd-cpp tests compilation.

---
 rd-cpp/src/rd_framework_cpp/src/test/cases/BufferTest.cpp | 8 ++++----
 .../rd_framework_cpp/src/test/kotlin_interaction/test.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rd-cpp/src/rd_framework_cpp/src/test/cases/BufferTest.cpp b/rd-cpp/src/rd_framework_cpp/src/test/cases/BufferTest.cpp
index c1ea1e87e..e47536c60 100644
--- a/rd-cpp/src/rd_framework_cpp/src/test/cases/BufferTest.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/test/cases/BufferTest.cpp
@@ -336,15 +336,15 @@ TEST(BufferTest, duration)
 {
 	Buffer buffer;
 
-	Duration duration{5};
+	TimeSpan duration{5};
 
-	buffer.write_duration(duration);
+	buffer.write_time_span(duration);
 
-	EXPECT_EQ(2 * sizeof(int64_t), buffer.get_position());
+	EXPECT_EQ(sizeof(int64_t), buffer.get_position());
 
 	buffer.rewind();
 
-	auto nt1 = buffer.read_duration();
+	auto nt1 = buffer.read_time_span();
 
 	EXPECT_EQ(duration, nt1);
 
diff --git a/rd-cpp/src/rd_framework_cpp/src/test/kotlin_interaction/test.cpp b/rd-cpp/src/rd_framework_cpp/src/test/kotlin_interaction/test.cpp
index cddfa1e12..927d0c2c9 100644
--- a/rd-cpp/src/rd_framework_cpp/src/test/kotlin_interaction/test.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/test/kotlin_interaction/test.cpp
@@ -28,11 +28,11 @@ int main()
 	Protocol clientProtocol{Identities::CLIENT, &testScheduler, std::move(wire), lifetime};
 
 	RdProperty<optional<int32_t>> property_main{0};
-	property_main.rdid = RdId(1);
+	property_main.set_id(RdId(1));
 	property_main.bind(lifetime, &clientProtocol, "top");
 
 	RdProperty<optional<int32_t>> property_rx{0};
-	property_rx.rdid = RdId(2);
+	property_rx.set_id(RdId(2));
 	property_rx.bind(lifetime, &clientProtocol, "rx");
 
 	property_rx.advise(lifetime, [](optional<int32_t> const& x) { std::cout << "rx value changed to " << *x << "\n"; });

From 073fbb407b6fc181e6a6e27c55e8b6dd83025abd Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Wed, 13 Dec 2023 11:42:54 +0200
Subject: [PATCH 02/15] Fix PumpScheduler thread-safety.

---
 .../src/rd_framework_cpp/src/main/wire/PumpScheduler.cpp  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.cpp b/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.cpp
index 2d9ac1da3..9f66b0043 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.cpp
@@ -14,9 +14,13 @@ PumpScheduler::PumpScheduler() : created_thread_id(std::this_thread::get_id())
 
 void PumpScheduler::flush()
 {
+	std::function<void()> action;
 	assert_thread();
-	auto action = std::move(messages.front());
-	messages.pop();
+	{
+		std::lock_guard<decltype(lock)> guard(lock);
+		action = std::move(messages.front());
+		messages.pop();
+	}
 	action();
 }
 

From 877e76d3fb5c109f3a92c559096d653857318f10 Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Wed, 13 Dec 2023 11:44:03 +0200
Subject: [PATCH 03/15] Fix testSlowpokeExtension to not fail randomly because
 of multi-threading.

---
 .../src/test/cases/RdExtTest.cpp                | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/rd-cpp/src/rd_framework_cpp/src/test/cases/RdExtTest.cpp b/rd-cpp/src/rd_framework_cpp/src/test/cases/RdExtTest.cpp
index ef00122b2..109fc2f7a 100644
--- a/rd-cpp/src/rd_framework_cpp/src/test/cases/RdExtTest.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/test/cases/RdExtTest.cpp
@@ -107,10 +107,10 @@ TEST_F(SocketWireTestBase, /*DISABLED_*/ testSlowpokeExtension)
 {
 	//	int64_t const serialization_hash = 1ll << 40u;
 
-	Protocol serverProtocol = server(socketLifetime);
-	Protocol clientProtocol = client(socketLifetime, serverProtocol);
+	const Protocol serverProtocol = server(socketLifetime);
+	const Protocol clientProtocol = client(socketLifetime, serverProtocol);
 
-	RdProperty<int> serverProperty{0}, clientProperty{0};
+	const RdProperty<int> serverProperty{0}, clientProperty{0};
 	init(serverProtocol, clientProtocol, &serverProperty, &clientProperty);
 
 	auto const& serverExt = serverProperty.getOrCreateExtension<ExtProperty<std::wstring>>("data", L"SERVER");
@@ -119,16 +119,17 @@ TEST_F(SocketWireTestBase, /*DISABLED_*/ testSlowpokeExtension)
 	serverExt.property.set(L"UPDATE");
 	serverExt.property.set(L"UPGRADE");
 
+	// wait for attempt to bind extension property in background dispatch thread
+	rd::util::sleep_this_thread(200);
+
 	auto const& clientExt = clientProperty.getOrCreateExtension<ExtProperty<std::wstring>>("data", L"CLIENT");
 	//	clientExt.serializationHash = serialization_hash;
 
 	EXPECT_EQ(clientExt.property.get(), L"CLIENT");
 
-	//	clientScheduler.pump_one_message(); //send Ready
-	//	serverScheduler.pump_one_message(); //send Ready
-	//	serverScheduler.pump_one_message(); //send ReceivedCounterpart
-	//	clientScheduler.pump_one_message(); //send ReceivedCounterpart
-	// no need in pumping due to synchronous scheduler
+	// proceed on client-server ext property connection after client ext property creation
+	clientScheduler.pump_one_message();
+
 	clientScheduler.pump_one_message();	   // send "UPDATE"
 
 	EXPECT_EQ(serverExt.property.get(), L"UPGRADE");

From d1f2152f3c22485d89a54df2f384d9eafb259c61 Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Wed, 13 Dec 2023 17:52:43 +0200
Subject: [PATCH 04/15] Fix rd-cpp generator to not produce circular
 dependencies for enums.

---
 .../rd/generator/nova/cpp/Cpp17Generator.kt   | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/rd-kt/rd-gen/src/main/kotlin/com/jetbrains/rd/generator/nova/cpp/Cpp17Generator.kt b/rd-kt/rd-gen/src/main/kotlin/com/jetbrains/rd/generator/nova/cpp/Cpp17Generator.kt
index 8573d361f..78e5c5af5 100644
--- a/rd-kt/rd-gen/src/main/kotlin/com/jetbrains/rd/generator/nova/cpp/Cpp17Generator.kt
+++ b/rd-kt/rd-gen/src/main/kotlin/com/jetbrains/rd/generator/nova/cpp/Cpp17Generator.kt
@@ -773,22 +773,6 @@ open class Cpp17Generator(
         file.copyTo(this.resolve(Files.PrecompiledHeaderCmake), overwrite = true)
     }
 
-
-    private fun PrettyPrinter.predeclare(decl: Declaration) {
-        surroundWithNamespaces(decl.namespace) {
-            when (decl) {
-                is Enum -> {
-                    val predecl = decl.getSetting(IsNonScoped)?.let {
-                        "enum ${decl.platformTypeName} : $it"
-                    } ?: "enum class ${decl.platformTypeName}"
-                    +("$predecl;")
-                }
-                else -> {
-                }
-            }
-        }
-    }
-
     object EnumConstantValue : ISetting<Int, Member.EnumConst>
     object IsNonScoped : ISetting<String, Enum>
 
@@ -824,10 +808,6 @@ open class Cpp17Generator(
                         .map { it.includeQuotes() }
                         .forEach { +it }
                     println()
-                    initializedEnums.forEach { enum ->
-                        predeclare(enum)
-                    }
-                    println()
                     withNamespace("rd") {
                         initializedEnums.forEach { enum ->
                             val map = enum.constants
@@ -997,7 +977,10 @@ open class Cpp17Generator(
         withIncludeGuard(decl.includeGuardName()) {
             println()
 
-            includesDecl(instantiationsFileName)
+            includesDecl()
+            if (decl !is Enum) {
+                +instantiationsFileName.includeWithExtension("h")
+            }
             println()
 
             dependenciesDecl(decl)
@@ -1312,7 +1295,7 @@ open class Cpp17Generator(
 //endregion
 
     //region TraitDecl
-    protected fun PrettyPrinter.includesDecl(instantiationsFileName: String) {
+    private fun PrettyPrinter.includesDecl() {
 //        +"class ${decl.name};"
 
         val standardHeaders = listOf(
@@ -1366,8 +1349,6 @@ open class Cpp17Generator(
         println()
         //third-party
         +"thirdparty".includeWithExtension("hpp")
-
-        +instantiationsFileName.includeWithExtension("h")
     }
 
     private fun Declaration.parseType(type: IType, allowPredefined: Boolean): IType? {

From 7d090065ee9f8d178412ef3205a43708e7b5a1a5 Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Wed, 13 Dec 2023 17:53:43 +0200
Subject: [PATCH 05/15] Fix ArraySerializer for non-Wrapper types.

---
 rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h   | 9 ++++-----
 .../src/main/serialization/ArraySerializer.h             | 3 ---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h
index b1e65c0bd..20e81d239 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h
@@ -155,9 +155,8 @@ class RD_FRAMEWORK_API Buffer final
 		}
 	}
 
-	template <template <class, class> class C, typename T, typename A = allocator<T>,
-		typename = typename std::enable_if_t<!rd::util::in_heap_v<T>>>
-	void write_array(C<T, A> const& container, std::function<void(T const&)> writer)
+	template <template <class, class> class C, typename T, typename A = allocator<T>>
+	std::enable_if_t<!rd::util::in_heap_v<T>, void> write_array(C<T, A> const& container, std::function<void(T const&)> writer)
 	{
 		using rd::size;
 		write_integral<int32_t>(size(container));
@@ -167,8 +166,8 @@ class RD_FRAMEWORK_API Buffer final
 		}
 	}
 
-	template <template <class, class> class C, typename T, typename A = allocator<Wrapper<T>>>
-	void write_array(C<Wrapper<T>, A> const& container, std::function<void(T const&)> writer)
+	template <template <class, class> class C, typename T, typename A = allocator<value_or_wrapper<T>>>
+	std::enable_if_t<is_wrapper_v<value_or_wrapper<T>>, void> write_array(C<value_or_wrapper<T>, A> const& container, std::function<void(T const&)> writer)
 	{
 		using rd::size;
 		write_integral<int32_t>(size(container));
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/serialization/ArraySerializer.h b/rd-cpp/src/rd_framework_cpp/src/main/serialization/ArraySerializer.h
index 040027b10..1127779aa 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/serialization/ArraySerializer.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/serialization/ArraySerializer.h
@@ -1,11 +1,8 @@
 #ifndef RD_CPP_ARRAYSERIALIZER_H
 #define RD_CPP_ARRAYSERIALIZER_H
 
-#include "serialization/SerializationCtx.h"
 #include "framework_traits.h"
 
-#include <vector>
-
 namespace rd
 {
 template <typename S, template <class, class> class C, typename T = typename util::read_t<S>,

From 237a4798608787c0d890db58f918fd171468bf35 Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Wed, 13 Dec 2023 18:10:26 +0200
Subject: [PATCH 06/15] Enable RD C++ tests.

---
 .github/workflows/build-rd-cpp.yml | 43 +++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-rd-cpp.yml b/.github/workflows/build-rd-cpp.yml
index b09c7209d..47dba48be 100644
--- a/.github/workflows/build-rd-cpp.yml
+++ b/.github/workflows/build-rd-cpp.yml
@@ -15,6 +15,7 @@ jobs:
     env:
       working-dir: ${{ github.workspace}}${{ matrix.config.SEP }}rd-cpp
       artifact: ${{ matrix.config.artifact }}${{ github.run_number }}.zip
+      GRADLE_USER_HOME: ${{ github.workspace }}/.github/gradle
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
     strategy:
@@ -46,7 +47,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      
+
     - name: Cache submodules
       uses: actions/cache@v3
       id: cache-submodules
@@ -65,7 +66,29 @@ jobs:
       uses: nuget/setup-nuget@v1
       with:
         nuget-version: '5.x'
-      
+
+    - name: Gradle JVM Cache
+      uses: actions/cache@v3
+      with:
+        path: ~/.local/share/gradle-jvm
+        key: ${{ runner.os }}.gradle-jvm-cache.${{ hashFiles('gradle/**') }}
+
+    - name: Gradle Wrapper Cache
+      uses: actions/cache@v3
+      with:
+        path: ${{ env.GRADLE_USER_HOME }}/wrapper
+        key: ${{ runner.os }}.gradle-wrapper.${{ hashFiles('gradle/**') }}
+
+    - name: Gradle Cache
+      uses: actions/cache@v3
+      with:
+        path: ${{ env.GRADLE_USER_HOME }}/caches/modules-2
+        key: ${{ runner.os }}.gradle.${{ hashFiles('**/*.gradle.kts') }}
+
+    - name: Generate everything
+      working-directory: ${{ env.working-dir }}/..
+      run: ./gradlew generateEverything
+
     - name: Cache Ninja
       uses: actions/cache@v3
       id: cache-ninja
@@ -74,7 +97,7 @@ jobs:
           rd-cpp/ninja
           rd-cpp/ninja.exe
         key: ${{ matrix.config.os }}-Ninja-${{ env.NINJA_VERSION }}
-      
+
     - name: Download Ninja
       if: steps.cache-ninja.outputs.cache-hit != 'true'
       id: download_ninja
@@ -104,7 +127,7 @@ jobs:
 
         if (NOT "${{ runner.os }}" STREQUAL "Windows")
           execute_process(COMMAND chmod +x ninja)
-        endif()
+        endif()  
 
     - name: Configure
       working-directory: ${{ env.working-dir }}
@@ -143,7 +166,7 @@ jobs:
           COMMAND ${CMAKE_COMMAND}
             -S .
             -B build
-            -DENABLE_TESTS_OPTION:BOOL=OFF
+            -DENABLE_TESTS_OPTION:BOOL=ON
             -DCMAKE_BUILD_TYPE=$ENV{BUILD_TYPE}
             -G Ninja
             -DCMAKE_MAKE_PROGRAM=${CMAKE_CURRENT_SOURCE_DIR}/ninja
@@ -191,10 +214,18 @@ jobs:
           message(FATAL_ERROR "Bad exit status")
         endif()
 
+    - name: Run core tests
+      working-directory: ${{ env.working-dir }}
+      run: build/src/rd_core_cpp/src/test/rd_core_cpp_test
+
+    - name: Run framework tests
+      working-directory: ${{ env.working-dir }}
+      run: build/src/rd_framework_cpp/src/test/rd_framework_cpp_test
+
     - name: Install Strip
       working-directory: ${{ env.working-dir }}
       run: cd build && cmake --config ${{ env.BUILD_TYPE }} -P cmake_install.cmake
-    
+
     - name: Pack
       working-directory: ${{ env.working-dir }}
       run: cd export && cmake -E tar "cfv" ../${{ env.artifact }} --format=zip include libs

From bedf781a57f19347ea3f4ac7153560e53fba33e8 Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Thu, 14 Dec 2023 12:16:56 +0200
Subject: [PATCH 07/15] Add helper script for local GitHub actions testing.

---
 scripts/rdact | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100755 scripts/rdact

diff --git a/scripts/rdact b/scripts/rdact
new file mode 100755
index 000000000..ba4191434
--- /dev/null
+++ b/scripts/rdact
@@ -0,0 +1,30 @@
+#!/bin/bash
+os="$(uname -s)"
+if ! which act
+then
+  if [[ "$os" -eq "Darwin" ]];
+  then
+    brew install act
+  else
+    echo "act auto-installation for $os not yet supported, you may install it manually using instructions from https://github.com/nektos/act" 1>&2
+    exit 1
+  fi
+fi
+
+if ! which docker
+then
+  echo "Docker installation required" 1>&2
+  exit 1
+fi
+
+if ! docker build -t rd/ubuntu:act-latest -f - . <<DOCKER
+FROM --platform=linux/amd64 catthehacker/ubuntu:act-latest
+RUN apt-get update && \
+    apt-get -y install cmake clang
+DOCKER
+then
+  echo "Failed to build custom Docker image" 1>&2
+  exit 1
+fi
+
+act -P ubuntu-latest=rd/ubuntu:act-latest --pull=false "$@"

From 475cf13c05753ef4050172588f50257963efbeee Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Fri, 15 Dec 2023 09:57:02 +0200
Subject: [PATCH 08/15] Update C++ gen gold.

---
 .../exampleModelTest/asis/ExampleModelNova/EnumSetTest.h         | 1 -
 .../testData/exampleModelTest/asis/ExampleModelNova/Z.h          | 1 -
 .../exampleModelTest/reversed/ExampleModelNova/EnumSetTest.h     | 1 -
 .../testData/exampleModelTest/reversed/ExampleModelNova/Z.h      | 1 -
 4 files changed, 4 deletions(-)

diff --git a/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/asis/ExampleModelNova/EnumSetTest.h b/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/asis/ExampleModelNova/EnumSetTest.h
index c896738e7..6528dcfdb 100644
--- a/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/asis/ExampleModelNova/EnumSetTest.h
+++ b/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/asis/ExampleModelNova/EnumSetTest.h
@@ -42,7 +42,6 @@
 #include <ctime>
 
 #include "thirdparty.hpp"
-#include "instantiations_ExampleRootNova.h"
 
 
 
diff --git a/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/asis/ExampleModelNova/Z.h b/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/asis/ExampleModelNova/Z.h
index f2729dc4d..c5f0e58bd 100644
--- a/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/asis/ExampleModelNova/Z.h
+++ b/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/asis/ExampleModelNova/Z.h
@@ -42,7 +42,6 @@
 #include <ctime>
 
 #include "thirdparty.hpp"
-#include "instantiations_ExampleRootNova.h"
 
 
 
diff --git a/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/reversed/ExampleModelNova/EnumSetTest.h b/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/reversed/ExampleModelNova/EnumSetTest.h
index c896738e7..6528dcfdb 100644
--- a/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/reversed/ExampleModelNova/EnumSetTest.h
+++ b/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/reversed/ExampleModelNova/EnumSetTest.h
@@ -42,7 +42,6 @@
 #include <ctime>
 
 #include "thirdparty.hpp"
-#include "instantiations_ExampleRootNova.h"
 
 
 
diff --git a/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/reversed/ExampleModelNova/Z.h b/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/reversed/ExampleModelNova/Z.h
index f2729dc4d..c5f0e58bd 100644
--- a/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/reversed/ExampleModelNova/Z.h
+++ b/rd-kt/rd-gen/src/test/resources/testData/exampleModelTest/reversed/ExampleModelNova/Z.h
@@ -42,7 +42,6 @@
 #include <ctime>
 
 #include "thirdparty.hpp"
-#include "instantiations_ExampleRootNova.h"
 
 
 

From c8ec77f54b6686096d9451b55a19b5156268ddc2 Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Fri, 15 Dec 2023 10:29:42 +0200
Subject: [PATCH 09/15] Fix googletest submodule path in build-rd-cpp.yml.

---
 .github/workflows/build-rd-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-rd-cpp.yml b/.github/workflows/build-rd-cpp.yml
index 47dba48be..07ad0bc18 100644
--- a/.github/workflows/build-rd-cpp.yml
+++ b/.github/workflows/build-rd-cpp.yml
@@ -54,7 +54,7 @@ jobs:
       with:
         path: |
           rd-cpp/thirdparty/spdlog
-          rd-cpp/thirdparty/googletest
+          rd-cpp/googletest
         key: ${{ matrix.config.os }}-submodules-${{ hashFiles('.gitmodules') }}
       
     - name: Get submodules

From d63e00288305ec4a453d63590542f004f9e03085 Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Fri, 15 Dec 2023 12:08:49 +0200
Subject: [PATCH 10/15] Fix compilation warnings for rd-cpp.

---
 .../src/main/base/IRdWireable.cpp                |  2 +-
 .../src/main/base/RdBindableBase.cpp             | 14 +++++++-------
 .../src/main/base/RdBindableBase.h               |  4 ++--
 .../src/main/protocol/MessageBroker.cpp          |  4 ++--
 .../src/main/scheduler/SimpleScheduler.cpp       |  2 +-
 .../src/main/scheduler/SingleThreadScheduler.cpp |  2 +-
 .../src/main/scheduler/SynchronousScheduler.cpp  |  2 +-
 .../scheduler/base/SingleThreadSchedulerBase.cpp |  2 +-
 .../serialization/DefaultAbstractDeclaration.cpp |  2 +-
 .../src/main/serialization/RdAny.cpp             |  2 +-
 .../src/main/wire/ByteBufferAsyncProcessor.cpp   |  2 +-
 .../src/main/wire/PkgInputStream.cpp             |  4 ++--
 .../src/main/wire/PkgInputStream.h               |  2 +-
 rd-cpp/thirdparty/clsocket/src/PassiveSocket.cpp | 11 +++++------
 rd-cpp/thirdparty/clsocket/src/SimpleSocket.cpp  | 16 ++++++----------
 rd-cpp/thirdparty/clsocket/src/SimpleSocket.h    |  9 ++++-----
 rd-cpp/thirdparty/clsocket/src/StatTimer.h       |  8 +++++---
 17 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/IRdWireable.cpp b/rd-cpp/src/rd_framework_cpp/src/main/base/IRdWireable.cpp
index 07b1fb2fe..471788ca7 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/IRdWireable.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/IRdWireable.cpp
@@ -2,4 +2,4 @@
 
 namespace rd
 {
-}
\ No newline at end of file
+}
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.cpp b/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.cpp
index 12879f03e..f9feaf089 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.cpp
@@ -14,13 +14,13 @@ bool RdBindableBase::is_bound() const
 	return parent != nullptr;
 }
 
-void RdBindableBase::bind(Lifetime lf, IRdDynamic const* parent, string_view name) const
+void RdBindableBase::bind(Lifetime lf, IRdDynamic const* inParent, string_view name) const
 {
-	RD_ASSERT_MSG(!is_bound(), ("Trying to bind already bound this to " + to_string(parent->get_location())));
+	RD_ASSERT_MSG(!is_bound(), ("Trying to bind already bound this to " + to_string(inParent->get_location())));
 	lf->bracket(
-		[this, lf, parent, &name] {
-			this->parent = parent;
-			location = parent->get_location().sub(name, ".");
+		[this, lf, inParent, &name] {
+			this->parent = inParent;
+			location = inParent->get_location().sub(name, ".");
 			this->bind_lifetime = lf;
 		},
 		[this, lf]() {
@@ -88,13 +88,13 @@ SerializationCtx& RdBindableBase::get_serialization_context() const
 	}
 }
 
-void RdBindableBase::init(Lifetime lifetime) const
+void RdBindableBase::init(Lifetime inLifetime) const
 {
 	for (const auto& it : bindable_extensions)
 	{
 		if (it.second != nullptr)
 		{
-			bindPolymorphic(*(it.second), lifetime, this, it.first);
+			bindPolymorphic(*(it.second), inLifetime, this, it.first);
 		}
 	}
 }
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h b/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h
index 1042ccf2d..35dee4e72 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h
@@ -45,7 +45,7 @@ class RD_FRAMEWORK_API RdBindableBase : public virtual IRdBindable /*, IPrintabl
 	// endregion
 
 	// need to implement in subclasses
-	virtual void init(Lifetime lifetime) const;
+	virtual void init(Lifetime inLifetime) const;
 
 	const RName& get_location() const override;
 
@@ -53,7 +53,7 @@ class RD_FRAMEWORK_API RdBindableBase : public virtual IRdBindable /*, IPrintabl
 
 	void set_id(RdId id) const override;
 
-	void bind(Lifetime lf, IRdDynamic const* parent, string_view name) const override;
+	void bind(Lifetime lf, IRdDynamic const* inParent, string_view name) const override;
 
 	void identify(const Identities& identities, RdId const& id) const override;
 
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.cpp b/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.cpp
index 8d14973e0..02d53ffd9 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.cpp
@@ -91,11 +91,11 @@ void MessageBroker::dispatch(RdId id, Buffer message) const
 				{
 					auto t = std::move(broker[id]);
 					broker.erase(id);
-					for (auto& it : t.custom_scheduler_messages)
+					for (auto& schedMsg : t.custom_scheduler_messages)
 					{
 						RD_ASSERT_MSG(subscription->get_wire_scheduler() != default_scheduler,
 							"require equals of wire and default schedulers")
-						invoke(subscription, std::move(it));
+						invoke(subscription, std::move(schedMsg));
 					}
 				}
 			};
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SimpleScheduler.cpp b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SimpleScheduler.cpp
index 21f043f20..a34c69459 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SimpleScheduler.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SimpleScheduler.cpp
@@ -15,4 +15,4 @@ bool SimpleScheduler::is_active() const
 {
 	return true;
 }
-}	 // namespace rd
\ No newline at end of file
+}	 // namespace rd
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SingleThreadScheduler.cpp b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SingleThreadScheduler.cpp
index 8bacb855a..1d7608551 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SingleThreadScheduler.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SingleThreadScheduler.cpp
@@ -21,4 +21,4 @@ SingleThreadScheduler::SingleThreadScheduler(Lifetime lifetime, std::string name
 		}
 	});
 }
-}	 // namespace rd
\ No newline at end of file
+}	 // namespace rd
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SynchronousScheduler.cpp b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SynchronousScheduler.cpp
index 91cf16796..4afe77f1d 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SynchronousScheduler.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/SynchronousScheduler.cpp
@@ -20,4 +20,4 @@ bool SynchronousScheduler::is_active() const
 {
 	return SynchronousScheduler_active_count > 0;
 }
-}	 // namespace rd
\ No newline at end of file
+}	 // namespace rd
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.cpp b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.cpp
index caf64b42a..d85196546 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.cpp
@@ -58,4 +58,4 @@ bool SingleThreadSchedulerBase::is_active() const
 }
 
 SingleThreadSchedulerBase::~SingleThreadSchedulerBase() = default;
-}	 // namespace rd
\ No newline at end of file
+}	 // namespace rd
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/serialization/DefaultAbstractDeclaration.cpp b/rd-cpp/src/rd_framework_cpp/src/main/serialization/DefaultAbstractDeclaration.cpp
index 05339dc4c..703c8ef26 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/serialization/DefaultAbstractDeclaration.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/serialization/DefaultAbstractDeclaration.cpp
@@ -26,4 +26,4 @@ void DefaultAbstractDeclaration::write(SerializationCtx& /*ctx*/, Buffer& /*buff
 {
 	throw std::invalid_argument("DefaultAbstractDeclaration couldn't be written");
 }
-}	 // namespace rd
\ No newline at end of file
+}	 // namespace rd
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/serialization/RdAny.cpp b/rd-cpp/src/rd_framework_cpp/src/main/serialization/RdAny.cpp
index ac4d45f9e..638642a27 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/serialization/RdAny.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/serialization/RdAny.cpp
@@ -5,4 +5,4 @@ namespace rd
 namespace any
 {
 }
-}	 // namespace rd
\ No newline at end of file
+}	 // namespace rd
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.cpp b/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.cpp
index 4d315a28d..925183cb5 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.cpp
@@ -93,7 +93,7 @@ bool ByteBufferAsyncProcessor::reprocess()
 			pending_queue.pop_front();
 			++current_seqn;
 		}
-		for (int i = 0; i < pending_queue.size(); ++i)
+		for (size_t i = 0; i < pending_queue.size(); ++i)
 		{
 			auto const& item = pending_queue[i];
 			if (!processor(item, current_seqn + i))
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.cpp b/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.cpp
index 7230a94c3..033652aff 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.cpp
@@ -33,7 +33,7 @@ Buffer& PkgInputStream::get_buffer()
 
 int32_t PkgInputStream::try_read(Buffer::word_t* res, size_t size)
 {
-	if (memory == -1 || buffer.get_position() == memory)
+	if (memory == -1 || static_cast<int32_t>(buffer.get_position()) == memory)
 	{
 		memory = request_data();
 		if (memory == -1)
@@ -52,7 +52,7 @@ bool PkgInputStream::read(Buffer::word_t* res, size_t size)
 {
 	//		spdlog::trace("PkgInputStream call: size={}, pos={}, memory={}", size, buffer.get_position(), memory);
 
-	int32_t summary_size = 0;
+	size_t summary_size = 0;
 	while (summary_size < size)
 	{
 		const int32_t bytes_read = try_read(res + summary_size, size - summary_size);
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h b/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h
index 18075c1d1..da2a1b893 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h
@@ -19,7 +19,7 @@ class RD_FRAMEWORK_API PkgInputStream
 
 	std::function<int32_t()> request_data;
 
-	size_t memory = 0;
+	int32_t memory = 0;
 
 public:
 	template <typename F>
diff --git a/rd-cpp/thirdparty/clsocket/src/PassiveSocket.cpp b/rd-cpp/thirdparty/clsocket/src/PassiveSocket.cpp
index 453263e8f..120383709 100644
--- a/rd-cpp/thirdparty/clsocket/src/PassiveSocket.cpp
+++ b/rd-cpp/thirdparty/clsocket/src/PassiveSocket.cpp
@@ -198,7 +198,7 @@ bool CPassiveSocket::Listen(const char *pAddr, uint16_t nPort, int32_t nConnecti
 //
 //------------------------------------------------------------------------------
 CActiveSocket *CPassiveSocket::Accept() {
-    uint32_t nSockLen;
+    uint32_t nClientSockLen;
     CActiveSocket *pClientSocket = NULL;
     SOCKET socket = static_cast<SOCKET>(CSimpleSocket::SocketError);
 
@@ -218,11 +218,11 @@ CActiveSocket *CPassiveSocket::Accept() {
         m_timer.Initialize();
         m_timer.SetStartTime();
 
-        nSockLen = sizeof(m_stClientSockaddr);
+        nClientSockLen = sizeof(m_stClientSockaddr);
 
         do {
             errno = 0;
-            socket = accept(m_socket, (struct sockaddr *) &m_stClientSockaddr, (socklen_t *) &nSockLen);
+            socket = accept(m_socket, (struct sockaddr *) &m_stClientSockaddr, (socklen_t *) &nClientSockLen);
 
             if (socket != static_cast<SOCKET>(-1)) {
                 pClientSocket->SetSocketHandle(socket);
@@ -274,9 +274,8 @@ int32_t CPassiveSocket::Send(const uint8_t *pBuf, size_t bytesToSend) {
                     m_timer.Initialize();
                     m_timer.SetStartTime();
 
-                    m_nBytesSent = SENDTO(m_socket, pBuf, bytesToSend, 0,
-                                          (const sockaddr *) &m_stClientSockaddr,
-                                          sizeof(m_stClientSockaddr));
+					m_nBytesSent = static_cast<int32_t>(SENDTO(m_socket, pBuf, bytesToSend, 0,
+						reinterpret_cast<const sockaddr*>(&m_stClientSockaddr), sizeof(m_stClientSockaddr)));
 
                     m_timer.SetEndTime();
 
diff --git a/rd-cpp/thirdparty/clsocket/src/SimpleSocket.cpp b/rd-cpp/thirdparty/clsocket/src/SimpleSocket.cpp
index 8330ca800..fbc400082 100644
--- a/rd-cpp/thirdparty/clsocket/src/SimpleSocket.cpp
+++ b/rd-cpp/thirdparty/clsocket/src/SimpleSocket.cpp
@@ -401,7 +401,7 @@ int32_t CSimpleSocket::Send(const uint8_t *pBuf, size_t bytesToSend)
                 //---------------------------------------------------------
                 do
                 {
-                    m_nBytesSent = SEND(m_socket, pBuf, bytesToSend, 0);
+                    m_nBytesSent = static_cast<int32_t>(SEND(m_socket, pBuf, bytesToSend, 0));
                     TranslateSocketError();
                 } while (GetSocketError() == CSimpleSocket::SocketInterrupted);
 
@@ -436,7 +436,7 @@ int32_t CSimpleSocket::Send(const uint8_t *pBuf, size_t bytesToSend)
                 {
                     do
                     {
-                        m_nBytesSent = SENDTO(m_socket, pBuf, bytesToSend, 0, (const sockaddr *)&m_stServerSockaddr, sizeof(m_stServerSockaddr));
+                        m_nBytesSent = static_cast<int32_t>(SENDTO(m_socket, pBuf, bytesToSend, 0, reinterpret_cast<const sockaddr*>(&m_stServerSockaddr), sizeof(m_stServerSockaddr)));
                         TranslateSocketError();
                     } while (GetSocketError() == CSimpleSocket::SocketInterrupted);
                 }
@@ -594,7 +594,7 @@ int32_t CSimpleSocket::Send(const struct iovec *sendVector, int32_t nNumItems)
     SetSocketError(SocketSuccess);
     m_nBytesSent = 0;
 
-    if ((m_nBytesSent = WRITEV(m_socket, sendVector, nNumItems)) == CSimpleSocket::SocketError)
+    if ((m_nBytesSent = static_cast<int32_t>(WRITEV(m_socket, sendVector, nNumItems)) == CSimpleSocket::SocketError))
     {
         TranslateSocketError();
     }
@@ -763,8 +763,7 @@ int32_t CSimpleSocket::Receive(int32_t nMaxBytes, uint8_t * pBuffer )
     {
         do
         {
-            m_nBytesReceived = RECV(m_socket, (pWorkBuffer + m_nBytesReceived),
-                                    nMaxBytes, m_nFlags);
+            m_nBytesReceived = static_cast<int32_t>(RECV(m_socket, (pWorkBuffer + m_nBytesReceived), nMaxBytes, m_nFlags));
             TranslateSocketError();
         } while ((GetSocketError() == CSimpleSocket::SocketInterrupted));
 
@@ -780,8 +779,7 @@ int32_t CSimpleSocket::Receive(int32_t nMaxBytes, uint8_t * pBuffer )
         {
             do
             {
-                m_nBytesReceived = RECVFROM(m_socket, pWorkBuffer, nMaxBytes, 0,
-                                            &m_stMulticastGroup, &srcSize);
+                m_nBytesReceived = static_cast<int32_t>(RECVFROM(m_socket, pWorkBuffer, nMaxBytes, 0, &m_stMulticastGroup, &srcSize));
                 TranslateSocketError();
             } while (GetSocketError() == CSimpleSocket::SocketInterrupted);
         }
@@ -789,8 +787,7 @@ int32_t CSimpleSocket::Receive(int32_t nMaxBytes, uint8_t * pBuffer )
         {
             do
             {
-                m_nBytesReceived = RECVFROM(m_socket, pWorkBuffer, nMaxBytes, 0,
-                                            &m_stClientSockaddr, &srcSize);
+                m_nBytesReceived = static_cast<int32_t>(RECVFROM(m_socket, pWorkBuffer, nMaxBytes, 0, &m_stClientSockaddr, &srcSize));
                 TranslateSocketError();
             } while (GetSocketError() == CSimpleSocket::SocketInterrupted);
         }
@@ -1183,4 +1180,3 @@ bool CSimpleSocket::Select(int32_t nTimeoutSec, int32_t nTimeoutUSec)
 
     return bRetVal;
 }
-
diff --git a/rd-cpp/thirdparty/clsocket/src/SimpleSocket.h b/rd-cpp/thirdparty/clsocket/src/SimpleSocket.h
index 5a895e8cb..91f82e4d5 100644
--- a/rd-cpp/thirdparty/clsocket/src/SimpleSocket.h
+++ b/rd-cpp/thirdparty/clsocket/src/SimpleSocket.h
@@ -324,14 +324,14 @@ class CSimpleSocket {
     /// call to CSimpleSocket::Open waits until it completes.
     /// @return the length of time in seconds
     int32_t GetConnectTimeoutSec(void) {
-        return  m_stConnectTimeout.tv_sec;
+        return static_cast<int32_t>(m_stConnectTimeout.tv_sec);
     };
 
     /// Gets the timeout value that specifies the maximum number of microseconds
     /// a call to CSimpleSocket::Open waits until it completes.
     /// @return the length of time in microseconds
     int32_t GetConnectTimeoutUSec(void) {
-        return  m_stConnectTimeout.tv_usec;
+        return  static_cast<int32_t>(m_stConnectTimeout.tv_usec);
     };
 
     /// Sets the timeout value that specifies the maximum amount of time a call
@@ -354,7 +354,7 @@ class CSimpleSocket {
     /// a call to CSimpleSocket::Receive waits until it completes.
     /// @return the length of time in seconds
     int32_t GetReceiveTimeoutSec(void) {
-        return  m_stRecvTimeout.tv_sec;
+        return  static_cast<int32_t>(m_stRecvTimeout.tv_sec);
     };
 
     /// Gets the timeout value that specifies the maximum number of microseconds
@@ -397,7 +397,7 @@ class CSimpleSocket {
     /// a call to CSimpleSocket::Send waits until it completes.
     /// @return the length of time in seconds
     int32_t GetSendTimeoutSec(void) {
-        return  m_stSendTimeout.tv_sec;
+        return static_cast<int32_t>(m_stSendTimeout.tv_sec);
     };
 
     /// Gets the timeout value that specifies the maximum number of microseconds
@@ -586,4 +586,3 @@ class CSimpleSocket {
 
 
 #endif /*  __SOCKET_H__  */
-
diff --git a/rd-cpp/thirdparty/clsocket/src/StatTimer.h b/rd-cpp/thirdparty/clsocket/src/StatTimer.h
index 9e7a0883a..06a54a995 100644
--- a/rd-cpp/thirdparty/clsocket/src/StatTimer.h
+++ b/rd-cpp/thirdparty/clsocket/src/StatTimer.h
@@ -103,12 +103,14 @@ class CStatTimer {
     {
         struct timeval tmpTime;
         GET_CLOCK_COUNT(&tmpTime);
-        return ((tmpTime.tv_sec * MICROSECONDS_CONVERSION) + tmpTime.tv_usec);
+        return static_cast<uint32_t>(tmpTime.tv_sec * MICROSECONDS_CONVERSION + tmpTime.tv_usec);
     };
 
 private:
-    uint32_t CalcTotalUSec() { return (((m_endTime.tv_sec - m_startTime.tv_sec) * MICROSECONDS_CONVERSION) +
-                                    (m_endTime.tv_usec - m_startTime.tv_usec)); };
+    uint32_t CalcTotalUSec() const
+    {
+	    return static_cast<uint32_t>((m_endTime.tv_sec - m_startTime.tv_sec) * MICROSECONDS_CONVERSION + (m_endTime.tv_usec - m_startTime.tv_usec));
+    };
 
 
 private:

From 949f4c8d31d77a0a9cf35094d4605fe09b7fde2e Mon Sep 17 00:00:00 2001
From: Alexander Bondarev <alexander.bondarev@jetbrains.com>
Date: Fri, 15 Dec 2023 12:27:26 +0200
Subject: [PATCH 11/15] Support static library mode for rd_framework_cpp (made
 rd_core_cpp always static because there are no reason to be shared).

---
 rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt  |  7 ++++---
 .../rd_framework_cpp/src/main/CMakeLists.txt    | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt b/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
index ae7f5e079..67c681e73 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
+++ b/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
@@ -1,6 +1,5 @@
 #lib
-
-add_library(rd_core_cpp SHARED
+set(RD_CORE_CPP_SOURCES
         #lifetime
         lifetime/LifetimeImpl.cpp lifetime/LifetimeImpl.h
         lifetime/Lifetime.cpp lifetime/Lifetime.h
@@ -37,7 +36,9 @@ add_library(rd_core_cpp SHARED
         util/gen_util.h util/overloaded.h
         #pch
         ${PCH_CPP_OPT}
-        )
+)
+
+add_library(rd_core_cpp STATIC ${RD_CORE_CPP_SOURCES})
 
 include(GenerateExportHeader)
 generate_export_header(rd_core_cpp
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt b/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
index 142323194..ca334dd7e 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
+++ b/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
@@ -1,5 +1,5 @@
 #lib
-add_library(rd_framework_cpp SHARED
+set(RD_FRAMEWORK_CPP_SOURCES
         #base
         base/IRdBindable.h
         base/IRdReactive.h
@@ -63,7 +63,16 @@ add_library(rd_framework_cpp SHARED
         protocol/Protocol.cpp protocol/Protocol.h
         protocol/MessageBroker.cpp protocol/MessageBroker.h
         #pch
-        ${PCH_CPP_OPT})
+        ${PCH_CPP_OPT}
+)
+
+option(RD_FRAMEWORK_CPP_SHARED "Add rd_framework_cpp as a shader library (static otherwise)" ON)
+
+if (RD_FRAMEWORK_CPP_SHARED)
+    add_library(rd_framework_cpp SHARED ${RD_FRAMEWORK_CPP_SOURCES})
+else ()
+    add_library(rd_framework_cpp STATIC ${RD_FRAMEWORK_CPP_SOURCES})
+endif ()
 
 include(GenerateExportHeader)
 generate_export_header(rd_framework_cpp
@@ -85,9 +94,7 @@ target_include_directories(rd_framework_cpp
         ${CMAKE_CURRENT_BINARY_DIR}
         )
 
-target_link_libraries(rd_framework_cpp
-        PUBLIC rd_core_cpp rd_framework_cpp_util rd_gen_cpp
-        )
+target_link_libraries(rd_framework_cpp PUBLIC rd_core_cpp rd_framework_cpp_util)
 
 find_package(Threads REQUIRED)
 target_link_libraries(rd_framework_cpp PRIVATE Threads::Threads clsocket)

From 8fe7dd3c9486f48d4c0c740ffd9866ef3ae1eebf Mon Sep 17 00:00:00 2001
From: "Alexander.Bondarev" <alexander.bondarev@jetbrains.com>
Date: Mon, 18 Dec 2023 12:09:23 +0200
Subject: [PATCH 12/15] Fix C++ warnings instead of disabling them. Fix flags
 for static compiled version of RD Core & Framework.

---
 rd-cpp/CMakeLists.txt                         |  3 ---
 .../src/rd_core_cpp/src/main/CMakeLists.txt   |  1 +
 .../rd_core_cpp/src/main/lifetime/Lifetime.h  |  9 --------
 .../src/main/lifetime/LifetimeImpl.h          |  9 --------
 .../src/main/lifetime/SequentialLifetimes.h   |  9 --------
 .../rd_framework_cpp/src/main/CMakeLists.txt  |  1 +
 .../src/main/base/IProtocol.h                 |  9 --------
 .../src/main/base/ISerializersOwner.h         |  9 --------
 .../rd_framework_cpp/src/main/base/IWire.h    |  9 --------
 .../src/main/base/RdBindableBase.h            |  8 -------
 .../src/main/base/RdPropertyBase.h            |  9 --------
 .../src/main/base/RdReactiveBase.h            | 23 +++++++++++--------
 .../rd_framework_cpp/src/main/ext/ExtWire.h   |  9 --------
 .../rd_framework_cpp/src/main/ext/RdExtBase.h | 11 ---------
 .../rd_framework_cpp/src/main/impl/RName.h    |  9 --------
 .../rd_framework_cpp/src/main/impl/RdList.h   |  9 --------
 .../rd_framework_cpp/src/main/impl/RdMap.h    |  9 --------
 .../src/main/impl/RdProperty.h                |  9 --------
 .../rd_framework_cpp/src/main/impl/RdSet.h    |  9 --------
 .../rd_framework_cpp/src/main/impl/RdSignal.h |  9 --------
 .../src/main/intern/InternRoot.h              | 10 --------
 .../src/main/protocol/Buffer.h                |  9 --------
 .../src/main/protocol/Identities.h            |  9 --------
 .../src/main/protocol/MessageBroker.h         |  9 --------
 .../src/main/protocol/Protocol.h              |  9 --------
 .../src/main/scheduler/base/IScheduler.h      |  9 --------
 .../base/SingleThreadSchedulerBase.h          |  9 --------
 .../src/main/serialization/SerializationCtx.h |  8 -------
 .../src/main/serialization/Serializers.h      |  9 --------
 .../rd_framework_cpp/src/main/task/RdCall.h   |  9 --------
 .../src/main/task/RdEndpoint.h                |  9 --------
 .../src/main/task/RdSymmetricCall.h           |  2 ++
 .../src/main/wire/ByteBufferAsyncProcessor.h  |  9 --------
 .../src/main/wire/PkgInputStream.h            |  9 --------
 .../src/main/wire/PumpScheduler.h             |  9 --------
 .../src/main/wire/SocketWire.h                |  9 --------
 36 files changed, 18 insertions(+), 292 deletions(-)

diff --git a/rd-cpp/CMakeLists.txt b/rd-cpp/CMakeLists.txt
index 192844ba4..703d4e4bc 100644
--- a/rd-cpp/CMakeLists.txt
+++ b/rd-cpp/CMakeLists.txt
@@ -41,9 +41,6 @@ elseif (MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
     add_compile_options(
             /wd4996     # POSIX name is deprecated
-            /wd4250     # method inheritance via dominance
-            /wd4251
-            /wd4275
     )
 endif ()
 
diff --git a/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt b/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
index 67c681e73..dbb35f156 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
+++ b/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
@@ -44,6 +44,7 @@ include(GenerateExportHeader)
 generate_export_header(rd_core_cpp
         BASE_NAME rd_core
         EXPORT_MACRO_NAME RD_CORE_API)
+set_target_properties(rd_core_cpp PROPERTIES COMPILE_FLAGS -DRD_CORE_STATIC_DEFINE)
 
 message(STATUS "Using pch by rd_core: '${ENABLE_PCH_HEADERS}'")
 
diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h
index 72c48cf79..7cf3f6403 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h
+++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_CORE_LIFETIMEWRAPPER_H
 #define RD_CPP_CORE_LIFETIMEWRAPPER_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "LifetimeImpl.h"
 
 #include <std/hash.h>
@@ -68,9 +63,5 @@ inline size_t hash<Lifetime>::operator()(const Lifetime& value) const noexcept
 	return hash<std::shared_ptr<LifetimeImpl> >()(value.ptr);
 }
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_CORE_LIFETIMEWRAPPER_H
diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h
index 455f28c8e..37ce81890 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h
+++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_CORE_LIFETIME_H
 #define RD_CPP_CORE_LIFETIME_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include <std/hash.h>
 
 #include <functional>
@@ -100,9 +95,5 @@ class RD_CORE_API LifetimeImpl final
 	void attach_nested(std::shared_ptr<LifetimeImpl> nested);
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_CORE_LIFETIME_H
diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h
index 2a42275e9..828ac0669 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h
+++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_CORE_SEQUENTIAL_LIFETIMES_H
 #define RD_CPP_CORE_SEQUENTIAL_LIFETIMES_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "LifetimeDefinition.h"
 #include "Lifetime.h"
 
@@ -43,9 +38,5 @@ class RD_CORE_API SequentialLifetimes
 	void set_current_lifetime(std::shared_ptr<LifetimeDefinition> new_def);
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_CORE_SEQUENTIAL_LIFETIMES_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt b/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
index ca334dd7e..d9390a38b 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
+++ b/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
@@ -72,6 +72,7 @@ if (RD_FRAMEWORK_CPP_SHARED)
     add_library(rd_framework_cpp SHARED ${RD_FRAMEWORK_CPP_SOURCES})
 else ()
     add_library(rd_framework_cpp STATIC ${RD_FRAMEWORK_CPP_SOURCES})
+    set_target_properties(rd_framework_cpp PROPERTIES COMPILE_FLAGS -DRD_FRAMEWORK_STATIC_DEFINE)
 endif ()
 
 include(GenerateExportHeader)
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/IProtocol.h b/rd-cpp/src/rd_framework_cpp/src/main/base/IProtocol.h
index 80627c8fd..43f3645f5 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/IProtocol.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/IProtocol.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_IPROTOCOL_H
 #define RD_CPP_IPROTOCOL_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "IRdDynamic.h"
 #include "serialization/Serializers.h"
 #include "protocol/Identities.h"
@@ -67,9 +62,5 @@ class RD_FRAMEWORK_API IProtocol : public IRdDynamic
 	const RName& get_location() const override;
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_IPROTOCOL_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/ISerializersOwner.h b/rd-cpp/src/rd_framework_cpp/src/main/base/ISerializersOwner.h
index 74a692a4f..74bf5ac37 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/ISerializersOwner.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/ISerializersOwner.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_ISERIALIZERSOWNER_H
 #define RD_CPP_ISERIALIZERSOWNER_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include <unordered_set>
 
 #include <rd_framework_export.h>
@@ -32,9 +27,5 @@ class RD_FRAMEWORK_API ISerializersOwner
 	virtual void registerSerializersCore(Serializers const& serializers) const = 0;
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_ISERIALIZERSOWNER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/IWire.h b/rd-cpp/src/rd_framework_cpp/src/main/base/IWire.h
index 5fd316d9a..b646da760 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/IWire.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/IWire.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_IWIRE_H
 #define RD_CPP_IWIRE_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "reactive/base/interfaces.h"
 #include "base/IRdReactive.h"
 #include "reactive/Property.h"
@@ -48,9 +43,5 @@ class RD_FRAMEWORK_API IWire
 	virtual void advise(Lifetime lifetime, IRdReactive const* entity) const = 0;
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_IWIRE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h b/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h
index 35dee4e72..98d5e4d76 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_RDBINDABLEBASE_H
 #define RD_CPP_RDBINDABLEBASE_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "IRdBindable.h"
 #include "base/IProtocol.h"
 
@@ -117,8 +112,5 @@ T& withIdFromName(T& that, std::string const& name)
 	return withId(that, RdId::Null().mix(name));
 }
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
 
 #endif	  // RD_CPP_RDBINDABLEBASE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/RdPropertyBase.h b/rd-cpp/src/rd_framework_cpp/src/main/base/RdPropertyBase.h
index 70a4cb631..cd421503f 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/RdPropertyBase.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/RdPropertyBase.h
@@ -5,11 +5,6 @@
 #include "serialization/Polymorphic.h"
 #include "reactive/Property.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
 namespace rd
 {
 template <typename T, typename S = Polymorphic<T>>
@@ -145,10 +140,6 @@ class RdPropertyBase : public RdReactiveBase, public Property<T>
 };
 }	 // namespace rd
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 static_assert(std::is_move_constructible<rd::RdPropertyBase<int>>::value, "Is move constructible from RdPropertyBase<int>");
 
 #endif	  // RD_CPP_RDPROPERTYBASE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/RdReactiveBase.h b/rd-cpp/src/rd_framework_cpp/src/main/base/RdReactiveBase.h
index a12a8abfb..b1964deed 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/RdReactiveBase.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/RdReactiveBase.h
@@ -9,11 +9,6 @@
 
 #include <rd_framework_export.h>
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
 namespace rd
 {
 // region predeclared
@@ -45,6 +40,20 @@ class RD_FRAMEWORK_API RdReactiveBase : public RdBindableBase, public IRdReactiv
 
 	// delegated
 
+	const RName& get_location() const override { return RdBindableBase::get_location(); }
+
+	const IProtocol* get_protocol() const override { return RdBindableBase::get_protocol(); }
+
+	SerializationCtx& get_serialization_context() const override { return RdBindableBase::get_serialization_context(); }
+
+	void set_id(RdId id) const override { RdBindableBase::set_id(id); }
+
+	RdId get_id() const override { return RdBindableBase::get_id(); }
+
+	void bind(Lifetime lf, IRdDynamic const* parent, string_view name) const override { RdBindableBase::bind(lf, parent, name); }
+
+	void identify(Identities const& identities, RdId const& id) const override { RdBindableBase::identify(identities, id); }
+
 	const Serializers& get_serializers() const;
 
 	IScheduler* get_default_scheduler() const;
@@ -71,8 +80,4 @@ class RD_FRAMEWORK_API RdReactiveBase : public RdBindableBase, public IRdReactiv
 };
 }	 // namespace rd
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 #endif	  // RD_CPP_RDREACTIVEBASE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/ext/ExtWire.h b/rd-cpp/src/rd_framework_cpp/src/main/ext/ExtWire.h
index 7222cecd6..0833aeb24 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/ext/ExtWire.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/ext/ExtWire.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_EXTWIRE_H
 #define RD_CPP_EXTWIRE_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "base/IWire.h"
 #include "protocol/RdId.h"
 #include "protocol/Buffer.h"
@@ -34,9 +29,5 @@ class RD_FRAMEWORK_API ExtWire final : public IWire
 	void send(RdId const& id, std::function<void(Buffer& buffer)> writer) const override;
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_EXTWIRE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/ext/RdExtBase.h b/rd-cpp/src/rd_framework_cpp/src/main/ext/RdExtBase.h
index ff01d1bd9..02f78031f 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/ext/RdExtBase.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/ext/RdExtBase.h
@@ -8,12 +8,6 @@
 
 #include <rd_framework_export.h>
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#pragma warning(disable : 4251)
-#endif
-
 namespace rd
 {
 /**
@@ -61,9 +55,4 @@ class RD_FRAMEWORK_API RdExtBase : public RdReactiveBase
 std::string to_string(RdExtBase::ExtState state);
 }	 // namespace rd
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-
 #endif	  // RD_CPP_RDEXTBASE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/impl/RName.h b/rd-cpp/src/rd_framework_cpp/src/main/impl/RName.h
index 7391dc022..0ddc806ab 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/impl/RName.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/impl/RName.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_FRAMEWORK_RNAME_H
 #define RD_CPP_FRAMEWORK_RNAME_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "thirdparty.hpp"
 
 #include <string>
@@ -51,9 +46,5 @@ class RD_FRAMEWORK_API RName
 	std::shared_ptr<RNameImpl> impl;
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_FRAMEWORK_RNAME_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/impl/RdList.h b/rd-cpp/src/rd_framework_cpp/src/main/impl/RdList.h
index f33dcbbe9..0c9f87134 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/impl/RdList.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/impl/RdList.h
@@ -6,11 +6,6 @@
 #include "serialization/Polymorphic.h"
 #include "std/allocator.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
 namespace rd
 {
 /**
@@ -256,10 +251,6 @@ class RdList final : public RdReactiveBase, public ViewableList<T, A>, public IS
 };
 }	 // namespace rd
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 static_assert(std::is_move_constructible<rd::RdList<int>>::value, "Is move constructible RdList<int>");
 
 #endif	  // RD_CPP_RDLIST_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/impl/RdMap.h b/rd-cpp/src/rd_framework_cpp/src/main/impl/RdMap.h
index 3345b5c38..43de09475 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/impl/RdMap.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/impl/RdMap.h
@@ -8,11 +8,6 @@
 
 #include <cstdint>
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
 namespace rd
 {
 /**
@@ -292,10 +287,6 @@ class RdMap final : public RdReactiveBase, public ViewableMap<K, V, KA, VA>, pub
 };
 }	 // namespace rd
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 static_assert(std::is_move_constructible<rd::RdMap<int, int>>::value, "Is move constructible RdMap<int, int>");
 static_assert(std::is_move_assignable<rd::RdMap<int, int>>::value, "Is move constructible RdMap<int, int>");
 static_assert(std::is_default_constructible<rd::RdMap<int, int>>::value, "Is default constructible RdMap<int, int>");
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/impl/RdProperty.h b/rd-cpp/src/rd_framework_cpp/src/main/impl/RdProperty.h
index d75973a24..1828458e8 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/impl/RdProperty.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/impl/RdProperty.h
@@ -6,11 +6,6 @@
 #include "serialization/ISerializable.h"
 #include "std/allocator.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
 namespace rd
 {
 /**
@@ -101,10 +96,6 @@ class RdProperty final : public RdPropertyBase<T, S>, public ISerializable
 };
 }	 // namespace rd
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 static_assert(std::is_move_constructible<rd::RdProperty<int>>::value, "Is move constructible from RdProperty<int>");
 
 #endif	  // RD_CPP_RDPROPERTY_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/impl/RdSet.h b/rd-cpp/src/rd_framework_cpp/src/main/impl/RdSet.h
index 83b14de48..e2d15fe86 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/impl/RdSet.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/impl/RdSet.h
@@ -6,11 +6,6 @@
 #include "serialization/Polymorphic.h"
 #include "std/allocator.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
 namespace rd
 {
 /**
@@ -159,10 +154,6 @@ class RdSet final : public RdReactiveBase, public ViewableSet<T, A>, public ISer
 };
 }	 // namespace rd
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 static_assert(std::is_move_constructible<rd::RdSet<int>>::value, "Is move constructible RdSet<int>");
 
 #endif	  // RD_CPP_RDSET_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/impl/RdSignal.h b/rd-cpp/src/rd_framework_cpp/src/main/impl/RdSignal.h
index 3576920b2..5ceaad527 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/impl/RdSignal.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/impl/RdSignal.h
@@ -8,11 +8,6 @@
 #include "base/RdReactiveBase.h"
 #include "serialization/Polymorphic.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
 namespace rd
 {
 /**
@@ -143,10 +138,6 @@ class RdSignal final : public RdReactiveBase, public ISignal<T>, public ISeriali
 };
 }	 // namespace rd
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 static_assert(std::is_move_constructible<rd::RdSignal<int>>::value, "Is not move constructible from RdSignal<int>");
 
 #endif	  // RD_CPP_RDSIGNAL_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/intern/InternRoot.h b/rd-cpp/src/rd_framework_cpp/src/main/intern/InternRoot.h
index e85a2d922..983aad27d 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/intern/InternRoot.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/intern/InternRoot.h
@@ -16,12 +16,6 @@
 
 #include <rd_framework_export.h>
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#pragma warning(disable : 4251)
-#endif
-
 namespace rd
 {
 // region predeclared
@@ -131,9 +125,5 @@ int32_t InternRoot::intern_value(Wrapper<T> value) const
 	return index;
 }
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_INTERNROOT_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h
index 20e81d239..e05d148be 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_UNSAFEBUFFER_H
 #define RD_CPP_UNSAFEBUFFER_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "types/DateTime.h"
 #include "types/TimeSpan.h"
 #include "util/core_util.h"
@@ -326,9 +321,5 @@ class RD_FRAMEWORK_API Buffer final
 	ByteArray& get_data();
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_UNSAFEBUFFER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Identities.h b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Identities.h
index 0b3116622..eddb2082c 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Identities.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Identities.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_FRAMEWORK_IDENTITIES_H
 #define RD_CPP_FRAMEWORK_IDENTITIES_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "protocol/RdId.h"
 
 #include <atomic>
@@ -51,9 +46,5 @@ class RD_FRAMEWORK_API Identities
 	RdId next(const RdId& parent) const;
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_FRAMEWORK_IDENTITIES_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.h b/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.h
index cce4102fa..3e5bbccc8 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_MESSAGEBROKER_H
 #define RD_CPP_MESSAGEBROKER_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "base/IRdReactive.h"
 
 #include "std/unordered_map.h"
@@ -62,9 +57,5 @@ class RD_FRAMEWORK_API MessageBroker final
 	void advise_on(Lifetime lifetime, IRdReactive const* entity) const;
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_MESSAGEBROKER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Protocol.h b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Protocol.h
index 12eb57eff..6bda3627c 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Protocol.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Protocol.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_PROTOCOL_H
 #define RD_CPP_PROTOCOL_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "base/IProtocol.h"
 #include "protocol/Identities.h"
 #include "serialization/SerializationCtx.h"
@@ -59,9 +54,5 @@ class RD_FRAMEWORK_API Protocol : /*IRdDynamic, */ public IProtocol
 	static std::shared_ptr<spdlog::logger> initializationLogger;
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_PROTOCOL_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/IScheduler.h b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/IScheduler.h
index 75dce8e50..25ecd8779 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/IScheduler.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/IScheduler.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_ISCHEDULER_H
 #define RD_CPP_ISCHEDULER_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include <functional>
 #include <thread>
 
@@ -57,9 +52,5 @@ class RD_FRAMEWORK_API IScheduler
 	}
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_ISCHEDULER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.h b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.h
index b08fe74f3..32c7e2848 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_SINGLETHREADSCHEDULERBASE_H
 #define RD_CPP_SINGLETHREADSCHEDULERBASE_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "scheduler/base/IScheduler.h"
 #include "lifetime/Lifetime.h"
 #include "spdlog/spdlog.h"
@@ -56,9 +51,5 @@ class RD_FRAMEWORK_API SingleThreadSchedulerBase : public IScheduler
 	bool is_active() const override;
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_SINGLETHREADSCHEDULERBASE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/serialization/SerializationCtx.h b/rd-cpp/src/rd_framework_cpp/src/main/serialization/SerializationCtx.h
index b82d5f06c..0c5597484 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/serialization/SerializationCtx.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/serialization/SerializationCtx.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_FRAMEWORK_SERIALIZATIONCTX_H
 #define RD_CPP_FRAMEWORK_SERIALIZATIONCTX_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "protocol/Buffer.h"
 #include "protocol/RdId.h"
 
@@ -105,8 +100,5 @@ void SerializationCtx::writeInterned(Buffer& buffer, const Wrapper<T>& value, F&
 	}
 }
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
 
 #endif	  // RD_CPP_FRAMEWORK_SERIALIZATIONCTX_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/serialization/Serializers.h b/rd-cpp/src/rd_framework_cpp/src/main/serialization/Serializers.h
index b631fe1a5..83c11b081 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/serialization/Serializers.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/serialization/Serializers.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_SERIALIZERS_H
 #define RD_CPP_SERIALIZERS_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "protocol/RdId.h"
 #include "serialization/ISerializable.h"
 #include "protocol/Identities.h"
@@ -150,9 +145,5 @@ void Serializers::writePolymorphic(SerializationCtx& ctx, Buffer& stream, T cons
 	writePolymorphicNullable(ctx, stream, value);
 }
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_SERIALIZERS_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/task/RdCall.h b/rd-cpp/src/rd_framework_cpp/src/main/task/RdCall.h
index 5f8dcc443..153a26d57 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/task/RdCall.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/task/RdCall.h
@@ -9,11 +9,6 @@
 
 #include <thread>
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
 namespace rd
 {
 /**
@@ -157,8 +152,4 @@ class RdCall : public virtual RdReactiveBase, public ISerializable
 };
 }	 // namespace rd
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 #endif	  // RD_CPP_RDCALL_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/task/RdEndpoint.h b/rd-cpp/src/rd_framework_cpp/src/main/task/RdEndpoint.h
index cce36bffb..441fe035b 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/task/RdEndpoint.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/task/RdEndpoint.h
@@ -4,11 +4,6 @@
 #include "serialization/Polymorphic.h"
 #include "RdTask.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-
 namespace rd
 {
 /**
@@ -136,8 +131,4 @@ class RdEndpoint : public virtual RdReactiveBase, public ISerializable
 };
 }	 // namespace rd
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 #endif	  // RD_CPP_RDENDPOINT_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/task/RdSymmetricCall.h b/rd-cpp/src/rd_framework_cpp/src/main/task/RdSymmetricCall.h
index c668d3914..c6cf2e971 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/task/RdSymmetricCall.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/task/RdSymmetricCall.h
@@ -20,6 +20,8 @@ class RdSymmetricCall : public RdCall<TReq, TRes, ReqSer, ResSer>, public RdEndp
 		RdEndpoint<TReq, TRes, ReqSer, ResSer>::on_wire_received(std::move(buffer));
 	}
 
+	IScheduler* get_wire_scheduler() const override { return RdCall<TReq, TRes, ReqSer, ResSer>::get_wire_scheduler(); }
+
 	friend bool operator==(const RdSymmetricCall& lhs, const RdSymmetricCall& rhs)
 	{
 		return &lhs == &rhs;
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.h b/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.h
index bfed4f903..3f24c9efc 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_BYTEBUFFERASYNCPROCESSOR_H
 #define RD_CPP_BYTEBUFFERASYNCPROCESSOR_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "protocol/Buffer.h"
 #include "spdlog/spdlog.h"
 
@@ -103,9 +98,5 @@ class RD_FRAMEWORK_API ByteBufferAsyncProcessor
 
 std::string to_string(ByteBufferAsyncProcessor::StateKind state);
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_BYTEBUFFERASYNCPROCESSOR_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h b/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h
index da2a1b893..d0bacb87e 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_PKGINPUTSTREAM_H
 #define RD_CPP_PKGINPUTSTREAM_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "protocol/Buffer.h"
 
 #include <rd_framework_export.h>
@@ -53,9 +48,5 @@ class RD_FRAMEWORK_API PkgInputStream
 	}
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_PKGINPUTSTREAM_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.h b/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.h
index 37730e132..bc3379fda 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_PUMPSCHEDULER_H
 #define RD_CPP_PUMPSCHEDULER_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "scheduler/base/IScheduler.h"
 
 #include <condition_variable>
@@ -54,9 +49,5 @@ class RD_FRAMEWORK_API PumpScheduler : public IScheduler
 }	 // namespace util
 }	 // namespace test
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_PUMPSCHEDULER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/SocketWire.h b/rd-cpp/src/rd_framework_cpp/src/main/wire/SocketWire.h
index e67b534e1..e71fe76cb 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/SocketWire.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/SocketWire.h
@@ -1,11 +1,6 @@
 #ifndef RD_CPP_SOCKETWIRE_H
 #define RD_CPP_SOCKETWIRE_H
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4251)
-#endif
-
 #include "scheduler/base/IScheduler.h"
 #include "base/WireBase.h"
 #include "ByteBufferAsyncProcessor.h"
@@ -175,9 +170,5 @@ class RD_FRAMEWORK_API SocketWire
 	};
 };
 }	 // namespace rd
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 
 #endif	  // RD_CPP_SOCKETWIRE_H

From 025c43086dd40772df4a347144c6b5c62d05f04b Mon Sep 17 00:00:00 2001
From: "Alexander.Bondarev" <alexander.bondarev@jetbrains.com>
Date: Mon, 18 Dec 2023 16:52:40 +0200
Subject: [PATCH 13/15] Fix linking for rd_framework_cpp and ensure
 rd_framework and rd_core always have same library type static/shared to avoid
 issues with code duplicates in different modules.

---
 rd-cpp/src/CMakeLists.txt                             |  2 ++
 rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt        |  8 ++++++--
 .../src/main/lifetime/LifetimeDefinition.cpp          | 11 ++++-------
 .../src/main/lifetime/LifetimeDefinition.h            |  2 +-
 rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt   | 10 ++++------
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/rd-cpp/src/CMakeLists.txt b/rd-cpp/src/CMakeLists.txt
index 4d1be5b19..bad47815b 100644
--- a/rd-cpp/src/CMakeLists.txt
+++ b/rd-cpp/src/CMakeLists.txt
@@ -1,3 +1,5 @@
+option(RD_STATIC "Compile RD as static library" OFF)
+
 add_subdirectory(rd_core_cpp)
 add_subdirectory(rd_framework_cpp)
 add_subdirectory(rd_gen_cpp)
\ No newline at end of file
diff --git a/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt b/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
index dbb35f156..876597570 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
+++ b/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
@@ -38,13 +38,17 @@ set(RD_CORE_CPP_SOURCES
         ${PCH_CPP_OPT}
 )
 
-add_library(rd_core_cpp STATIC ${RD_CORE_CPP_SOURCES})
+if (RD_STATIC)
+    add_library(rd_core_cpp STATIC ${RD_CORE_CPP_SOURCES})
+    target_compile_definitions(rd_core_cpp PUBLIC RD_CORE_STATIC_DEFINE)
+else ()
+    add_library(rd_core_cpp SHARED ${RD_CORE_CPP_SOURCES})
+endif ()
 
 include(GenerateExportHeader)
 generate_export_header(rd_core_cpp
         BASE_NAME rd_core
         EXPORT_MACRO_NAME RD_CORE_API)
-set_target_properties(rd_core_cpp PROPERTIES COMPILE_FLAGS -DRD_CORE_STATIC_DEFINE)
 
 message(STATUS "Using pch by rd_core: '${ENABLE_PCH_HEADERS}'")
 
diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp
index afadd735d..2115adc48 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp
+++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp
@@ -18,7 +18,7 @@ bool LifetimeDefinition::is_terminated() const
 	return lifetime->is_terminated();
 }
 
-void LifetimeDefinition::terminate()
+void LifetimeDefinition::terminate() const
 {
 	lifetime->terminate();
 }
@@ -28,14 +28,11 @@ bool LifetimeDefinition::is_eternal() const
 	return lifetime->is_eternal();
 }
 
-namespace
-{
-LifetimeDefinition ETERNAL(true);
-}
-
 std::shared_ptr<LifetimeDefinition> LifetimeDefinition::get_shared_eternal()
 {
-	return std::shared_ptr<LifetimeDefinition>(&ETERNAL, [](LifetimeDefinition* /*ld*/) {});
+	static LifetimeDefinition ETERNAL(true);
+
+	return {&ETERNAL, [](LifetimeDefinition* /*ld*/) {}};
 }
 
 LifetimeDefinition::~LifetimeDefinition()
diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h
index f28584d6c..8eb5a0060 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h
+++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h
@@ -44,7 +44,7 @@ class RD_CORE_API LifetimeDefinition
 
 	bool is_eternal() const;
 
-	void terminate();
+	void terminate() const;
 
 	template <typename F>
 	static auto use(F&& block) -> typename util::result_of_t<F(Lifetime)>
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt b/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
index d9390a38b..ce11672a4 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
+++ b/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
@@ -66,13 +66,11 @@ set(RD_FRAMEWORK_CPP_SOURCES
         ${PCH_CPP_OPT}
 )
 
-option(RD_FRAMEWORK_CPP_SHARED "Add rd_framework_cpp as a shader library (static otherwise)" ON)
-
-if (RD_FRAMEWORK_CPP_SHARED)
-    add_library(rd_framework_cpp SHARED ${RD_FRAMEWORK_CPP_SOURCES})
-else ()
+if (RD_STATIC)
     add_library(rd_framework_cpp STATIC ${RD_FRAMEWORK_CPP_SOURCES})
-    set_target_properties(rd_framework_cpp PROPERTIES COMPILE_FLAGS -DRD_FRAMEWORK_STATIC_DEFINE)
+    target_compile_definitions(rd_core_cpp PUBLIC RD_FRAMEWORK_STATIC_DEFINE)
+else ()
+    add_library(rd_framework_cpp SHARED ${RD_FRAMEWORK_CPP_SOURCES})
 endif ()
 
 include(GenerateExportHeader)

From 6c204c7c0d3048e5e977f968701a2a7513d3a146 Mon Sep 17 00:00:00 2001
From: "Alexander.Bondarev" <alexander.bondarev@jetbrains.com>
Date: Mon, 18 Dec 2023 18:30:14 +0200
Subject: [PATCH 14/15] Fix ByteBufferAsyncProcessor main loop to not hang when
 queue failed to process, but no new data added.

---
 .../src/main/wire/ByteBufferAsyncProcessor.cpp           | 9 ++++++---
 .../rd_framework_cpp/src/test/cases/SocketWireTest.cpp   | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.cpp b/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.cpp
index 925183cb5..087bc2407 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.cpp
@@ -141,7 +141,7 @@ void ByteBufferAsyncProcessor::ThreadProc()
 				return;
 			}
 
-			while (data.empty() || interrupt_balance != 0)
+			while (data.empty() && queue.empty() || interrupt_balance != 0)
 			{
 				if (state >= StateKind::Stopping)
 				{
@@ -156,8 +156,11 @@ void ByteBufferAsyncProcessor::ThreadProc()
 					return;
 				}
 			}
-			add_data(std::move(data));
-			data.clear();
+			if (!data.empty())
+			{
+				add_data(std::move(data));
+				data.clear();
+			}
 		}
 
 		try
diff --git a/rd-cpp/src/rd_framework_cpp/src/test/cases/SocketWireTest.cpp b/rd-cpp/src/rd_framework_cpp/src/test/cases/SocketWireTest.cpp
index 09697acf7..2a0cc8f7a 100644
--- a/rd-cpp/src/rd_framework_cpp/src/test/cases/SocketWireTest.cpp
+++ b/rd-cpp/src/rd_framework_cpp/src/test/cases/SocketWireTest.cpp
@@ -502,7 +502,6 @@ TEST_P(DisconnectTestBase, SimpleDisconnect)
 	{
 		try_close_socket(clientProtocol);
 	}
-	rd::util::sleep_this_thread(200);
 
 	cp.fire(3);
 	cp.fire(4);

From e9f12fc1d12985269f9f8d8664e5018ca149314a Mon Sep 17 00:00:00 2001
From: "Alexander.Bondarev" <alexander.bondarev@jetbrains.com>
Date: Tue, 19 Dec 2023 17:50:03 +0200
Subject: [PATCH 15/15] Returned code to disable 4252 warning because of
 problems with UnrealLink build. Made spdlog static lib for RD_STATIC build.

---
 rd-cpp/CMakeLists.txt                             |  2 ++
 rd-cpp/src/CMakeLists.txt                         |  2 --
 rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt    |  7 ++++++-
 .../src/rd_core_cpp/src/main/lifetime/Lifetime.h  |  4 ++++
 .../src/main/lifetime/LifetimeDefinition.cpp      |  2 +-
 .../src/main/lifetime/LifetimeDefinition.h        |  6 +++++-
 .../rd_core_cpp/src/main/lifetime/LifetimeImpl.h  |  4 ++++
 .../src/main/lifetime/SequentialLifetimes.h       |  4 ++++
 .../rd_core_cpp/src/main/util/export_api_helper.h | 15 +++++++++++++++
 .../src/rd_framework_cpp/src/main/CMakeLists.txt  |  6 +++++-
 .../rd_framework_cpp/src/main/base/IProtocol.h    |  4 ++++
 .../src/main/base/ISerializersOwner.h             |  4 ++++
 rd-cpp/src/rd_framework_cpp/src/main/base/IWire.h |  4 ++++
 .../src/main/base/RdBindableBase.h                |  4 ++++
 .../src/rd_framework_cpp/src/main/ext/ExtWire.h   |  4 ++++
 .../src/rd_framework_cpp/src/main/ext/RdExtBase.h |  4 ++++
 rd-cpp/src/rd_framework_cpp/src/main/impl/RName.h |  4 ++++
 .../rd_framework_cpp/src/main/intern/InternRoot.h |  4 ++++
 .../rd_framework_cpp/src/main/protocol/Buffer.h   |  4 ++++
 .../src/main/protocol/Identities.h                |  4 ++++
 .../src/main/protocol/MessageBroker.h             |  4 ++++
 .../rd_framework_cpp/src/main/protocol/Protocol.h |  4 ++++
 .../src/main/scheduler/base/IScheduler.h          |  4 ++++
 .../scheduler/base/SingleThreadSchedulerBase.h    |  4 ++++
 .../src/main/serialization/SerializationCtx.h     |  4 ++++
 .../src/main/serialization/Serializers.h          |  4 ++++
 .../src/main/wire/ByteBufferAsyncProcessor.h      |  4 ++++
 .../src/main/wire/PkgInputStream.h                |  4 ++++
 .../src/main/wire/PumpScheduler.h                 |  4 ++++
 .../rd_framework_cpp/src/main/wire/SocketWire.h   |  4 ++++
 rd-cpp/thirdparty/CMakeLists.txt                  |  6 +++++-
 31 files changed, 131 insertions(+), 7 deletions(-)
 create mode 100644 rd-cpp/src/rd_core_cpp/src/main/util/export_api_helper.h

diff --git a/rd-cpp/CMakeLists.txt b/rd-cpp/CMakeLists.txt
index 703d4e4bc..80b52f6e4 100644
--- a/rd-cpp/CMakeLists.txt
+++ b/rd-cpp/CMakeLists.txt
@@ -65,6 +65,8 @@ else ()
     set(PCH_CPP_OPT "")
 endif ()
 
+option(RD_STATIC "Compile RD as static library" OFF)
+
 add_subdirectory(thirdparty)
 add_subdirectory(src)
 
diff --git a/rd-cpp/src/CMakeLists.txt b/rd-cpp/src/CMakeLists.txt
index bad47815b..4d1be5b19 100644
--- a/rd-cpp/src/CMakeLists.txt
+++ b/rd-cpp/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-option(RD_STATIC "Compile RD as static library" OFF)
-
 add_subdirectory(rd_core_cpp)
 add_subdirectory(rd_framework_cpp)
 add_subdirectory(rd_gen_cpp)
\ No newline at end of file
diff --git a/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt b/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
index 876597570..db04f7fc9 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
+++ b/rd-cpp/src/rd_core_cpp/src/main/CMakeLists.txt
@@ -36,6 +36,7 @@ set(RD_CORE_CPP_SOURCES
         util/gen_util.h util/overloaded.h
         #pch
         ${PCH_CPP_OPT}
+        util/export_api_helper.h
 )
 
 if (RD_STATIC)
@@ -45,10 +46,14 @@ else ()
     add_library(rd_core_cpp SHARED ${RD_CORE_CPP_SOURCES})
 endif ()
 
+set(RD_CORE_EXPORT_HEADER_CUSTOM_CONTENT "#include \"util/export_api_helper.h\"")
+
 include(GenerateExportHeader)
 generate_export_header(rd_core_cpp
         BASE_NAME rd_core
-        EXPORT_MACRO_NAME RD_CORE_API)
+        EXPORT_MACRO_NAME RD_CORE_API
+        CUSTOM_CONTENT_FROM_VARIABLE RD_CORE_EXPORT_HEADER_CUSTOM_CONTENT
+)
 
 message(STATUS "Using pch by rd_core: '${ENABLE_PCH_HEADERS}'")
 
diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h
index 7cf3f6403..4144699eb 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h
+++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/Lifetime.h
@@ -9,6 +9,8 @@
 
 #include <rd_core_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 class Lifetime;
@@ -64,4 +66,6 @@ inline size_t hash<Lifetime>::operator()(const Lifetime& value) const noexcept
 }
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_CORE_LIFETIMEWRAPPER_H
diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp
index 2115adc48..5d8a86426 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp
+++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp
@@ -18,7 +18,7 @@ bool LifetimeDefinition::is_terminated() const
 	return lifetime->is_terminated();
 }
 
-void LifetimeDefinition::terminate() const
+void LifetimeDefinition::terminate()
 {
 	lifetime->terminate();
 }
diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h
index 8eb5a0060..39442e0e0 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h
+++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h
@@ -11,6 +11,8 @@
 
 #include <rd_core_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 class RD_CORE_API LifetimeDefinition
@@ -44,7 +46,7 @@ class RD_CORE_API LifetimeDefinition
 
 	bool is_eternal() const;
 
-	void terminate() const;
+	void terminate();
 
 	template <typename F>
 	static auto use(F&& block) -> typename util::result_of_t<F(Lifetime)>
@@ -56,4 +58,6 @@ class RD_CORE_API LifetimeDefinition
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_CORE_LIFETIME_DEFINITION_H
diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h
index 37ce81890..d62a1352e 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h
+++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h
@@ -14,6 +14,8 @@
 
 #include <rd_core_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 class RD_CORE_API LifetimeImpl final
@@ -96,4 +98,6 @@ class RD_CORE_API LifetimeImpl final
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_CORE_LIFETIME_H
diff --git a/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h b/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h
index 828ac0669..b909ed9cb 100644
--- a/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h
+++ b/rd-cpp/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h
@@ -6,6 +6,8 @@
 
 #include <rd_core_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 class RD_CORE_API SequentialLifetimes
@@ -39,4 +41,6 @@ class RD_CORE_API SequentialLifetimes
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_CORE_SEQUENTIAL_LIFETIMES_H
diff --git a/rd-cpp/src/rd_core_cpp/src/main/util/export_api_helper.h b/rd-cpp/src/rd_core_cpp/src/main/util/export_api_helper.h
new file mode 100644
index 000000000..1b533cf30
--- /dev/null
+++ b/rd-cpp/src/rd_core_cpp/src/main/util/export_api_helper.h
@@ -0,0 +1,15 @@
+#ifndef EXPORT_API_HELPER_H
+#define EXPORT_API_HELPER_H
+
+#if defined(_MSC_VER)
+#define RD_PUSH_STL_EXPORTS_WARNINGS \
+	_Pragma("warning(push)") \
+	_Pragma("warning(disable:4251)")
+#define RD_POP_STL_EXPORTS_WARNINGS \
+	_Pragma("warning(pop)")
+#else
+#define RD_PUSH_STL_EXPORTS_WARNINGS
+#define RD_POP_STL_EXPORTS_WARNINGS
+#endif
+
+#endif //EXPORT_API_HELPER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt b/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
index ce11672a4..171991068 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
+++ b/rd-cpp/src/rd_framework_cpp/src/main/CMakeLists.txt
@@ -73,10 +73,14 @@ else ()
     add_library(rd_framework_cpp SHARED ${RD_FRAMEWORK_CPP_SOURCES})
 endif ()
 
+set(RD_FRAMEWORK_EXPORT_HEADER_CUSTOM_CONTENT "#include \"util/export_api_helper.h\"")
+
 include(GenerateExportHeader)
 generate_export_header(rd_framework_cpp
         BASE_NAME rd_framework
-        EXPORT_MACRO_NAME RD_FRAMEWORK_API)
+        EXPORT_MACRO_NAME RD_FRAMEWORK_API
+        CUSTOM_CONTENT_FROM_VARIABLE RD_FRAMEWORK_EXPORT_HEADER_CUSTOM_CONTENT
+)
 
 message(STATUS "Using pch by rd_framework: '${ENABLE_PCH_HEADERS}'")
 
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/IProtocol.h b/rd-cpp/src/rd_framework_cpp/src/main/base/IProtocol.h
index 43f3645f5..590c3933b 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/IProtocol.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/IProtocol.h
@@ -11,6 +11,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 // region predeclared
@@ -63,4 +65,6 @@ class RD_FRAMEWORK_API IProtocol : public IRdDynamic
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_IPROTOCOL_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/ISerializersOwner.h b/rd-cpp/src/rd_framework_cpp/src/main/base/ISerializersOwner.h
index 74bf5ac37..5e758301a 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/ISerializersOwner.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/ISerializersOwner.h
@@ -5,6 +5,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 // region predeclared
@@ -28,4 +30,6 @@ class RD_FRAMEWORK_API ISerializersOwner
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_ISERIALIZERSOWNER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/IWire.h b/rd-cpp/src/rd_framework_cpp/src/main/base/IWire.h
index b646da760..7db2a5f78 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/IWire.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/IWire.h
@@ -7,6 +7,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 /**
@@ -44,4 +46,6 @@ class RD_FRAMEWORK_API IWire
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_IWIRE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h b/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h
index 98d5e4d76..9cd67a20b 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/base/RdBindableBase.h
@@ -8,6 +8,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 class RD_FRAMEWORK_API RdBindableBase : public virtual IRdBindable /*, IPrintable*/
@@ -113,4 +115,6 @@ T& withIdFromName(T& that, std::string const& name)
 }
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_RDBINDABLEBASE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/ext/ExtWire.h b/rd-cpp/src/rd_framework_cpp/src/main/ext/ExtWire.h
index 0833aeb24..ec6bd69d8 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/ext/ExtWire.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/ext/ExtWire.h
@@ -11,6 +11,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 class RD_FRAMEWORK_API ExtWire final : public IWire
@@ -30,4 +32,6 @@ class RD_FRAMEWORK_API ExtWire final : public IWire
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_EXTWIRE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/ext/RdExtBase.h b/rd-cpp/src/rd_framework_cpp/src/main/ext/RdExtBase.h
index 02f78031f..9de7e2429 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/ext/RdExtBase.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/ext/RdExtBase.h
@@ -8,6 +8,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 /**
@@ -55,4 +57,6 @@ class RD_FRAMEWORK_API RdExtBase : public RdReactiveBase
 std::string to_string(RdExtBase::ExtState state);
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_RDEXTBASE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/impl/RName.h b/rd-cpp/src/rd_framework_cpp/src/main/impl/RName.h
index 0ddc806ab..ff59839e0 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/impl/RName.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/impl/RName.h
@@ -6,6 +6,8 @@
 #include <string>
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 class RNameImpl;
@@ -47,4 +49,6 @@ class RD_FRAMEWORK_API RName
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_FRAMEWORK_RNAME_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/intern/InternRoot.h b/rd-cpp/src/rd_framework_cpp/src/main/intern/InternRoot.h
index 983aad27d..552656fea 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/intern/InternRoot.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/intern/InternRoot.h
@@ -16,6 +16,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 // region predeclared
@@ -126,4 +128,6 @@ int32_t InternRoot::intern_value(Wrapper<T> value) const
 }
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_INTERNROOT_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h
index e05d148be..10b4e8261 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Buffer.h
@@ -15,6 +15,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 /**
@@ -322,4 +324,6 @@ class RD_FRAMEWORK_API Buffer final
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_UNSAFEBUFFER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Identities.h b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Identities.h
index eddb2082c..df2f44bcd 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Identities.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Identities.h
@@ -7,6 +7,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 /**
@@ -47,4 +49,6 @@ class RD_FRAMEWORK_API Identities
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_FRAMEWORK_IDENTITIES_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.h b/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.h
index 3e5bbccc8..10282c397 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/protocol/MessageBroker.h
@@ -11,6 +11,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 class RD_FRAMEWORK_API Mq
@@ -58,4 +60,6 @@ class RD_FRAMEWORK_API MessageBroker final
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_MESSAGEBROKER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Protocol.h b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Protocol.h
index 6bda3627c..dc90ce6a9 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/protocol/Protocol.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/protocol/Protocol.h
@@ -9,6 +9,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 // region predeclared
@@ -55,4 +57,6 @@ class RD_FRAMEWORK_API Protocol : /*IRdDynamic, */ public IProtocol
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_PROTOCOL_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/IScheduler.h b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/IScheduler.h
index 25ecd8779..cb7132174 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/IScheduler.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/IScheduler.h
@@ -6,6 +6,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 /**
@@ -53,4 +55,6 @@ class RD_FRAMEWORK_API IScheduler
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_ISCHEDULER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.h b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.h
index 32c7e2848..7364e1c84 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/scheduler/base/SingleThreadSchedulerBase.h
@@ -9,6 +9,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace ctpl
 {
 class thread_pool;
@@ -52,4 +54,6 @@ class RD_FRAMEWORK_API SingleThreadSchedulerBase : public IScheduler
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_SINGLETHREADSCHEDULERBASE_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/serialization/SerializationCtx.h b/rd-cpp/src/rd_framework_cpp/src/main/serialization/SerializationCtx.h
index 0c5597484..69941ac5f 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/serialization/SerializationCtx.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/serialization/SerializationCtx.h
@@ -13,6 +13,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 // region predeclared
@@ -101,4 +103,6 @@ void SerializationCtx::writeInterned(Buffer& buffer, const Wrapper<T>& value, F&
 }
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_FRAMEWORK_SERIALIZATIONCTX_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/serialization/Serializers.h b/rd-cpp/src/rd_framework_cpp/src/main/serialization/Serializers.h
index 83c11b081..c9b42cc3b 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/serialization/Serializers.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/serialization/Serializers.h
@@ -17,6 +17,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 // region predeclared
@@ -146,4 +148,6 @@ void Serializers::writePolymorphic(SerializationCtx& ctx, Buffer& stream, T cons
 }
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_SERIALIZERS_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.h b/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.h
index 3f24c9efc..effbace0a 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/ByteBufferAsyncProcessor.h
@@ -13,6 +13,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 using sequence_number_t = int64_t;
@@ -99,4 +101,6 @@ class RD_FRAMEWORK_API ByteBufferAsyncProcessor
 std::string to_string(ByteBufferAsyncProcessor::StateKind state);
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_BYTEBUFFERASYNCPROCESSOR_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h b/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h
index d0bacb87e..a6deaa875 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/PkgInputStream.h
@@ -5,6 +5,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 class RD_FRAMEWORK_API PkgInputStream
@@ -49,4 +51,6 @@ class RD_FRAMEWORK_API PkgInputStream
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_PKGINPUTSTREAM_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.h b/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.h
index bc3379fda..d25db4695 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/PumpScheduler.h
@@ -10,6 +10,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 namespace rd
 {
 namespace test
@@ -50,4 +52,6 @@ class RD_FRAMEWORK_API PumpScheduler : public IScheduler
 }	 // namespace test
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_PUMPSCHEDULER_H
diff --git a/rd-cpp/src/rd_framework_cpp/src/main/wire/SocketWire.h b/rd-cpp/src/rd_framework_cpp/src/main/wire/SocketWire.h
index e71fe76cb..87584d5c5 100644
--- a/rd-cpp/src/rd_framework_cpp/src/main/wire/SocketWire.h
+++ b/rd-cpp/src/rd_framework_cpp/src/main/wire/SocketWire.h
@@ -12,6 +12,8 @@
 
 #include <rd_framework_export.h>
 
+RD_PUSH_STL_EXPORTS_WARNINGS
+
 class CSimpleSocket;
 class CActiveSocket;
 class CPassiveSocket;
@@ -171,4 +173,6 @@ class RD_FRAMEWORK_API SocketWire
 };
 }	 // namespace rd
 
+RD_POP_STL_EXPORTS_WARNINGS
+
 #endif	  // RD_CPP_SOCKETWIRE_H
diff --git a/rd-cpp/thirdparty/CMakeLists.txt b/rd-cpp/thirdparty/CMakeLists.txt
index 455c32496..8664719a0 100644
--- a/rd-cpp/thirdparty/CMakeLists.txt
+++ b/rd-cpp/thirdparty/CMakeLists.txt
@@ -6,7 +6,11 @@ set_property(TARGET clsocket PROPERTY POSITION_INDEPENDENT_CODE ON)
 add_subdirectory(countdownlatch)
 add_subdirectory(string-view-lite)
 add_subdirectory(CTPL)
-set(SPDLOG_BUILD_SHARED ON CACHE BOOL "Build shared library" FORCE)
+if (NOT RD_STATIC)
+        set(SPDLOG_BUILD_SHARED ON CACHE BOOL "Build shared library" FORCE)
+else()
+        set(SPDLOG_BUILD_SHARED OFF CACHE BOOL "Build shared library" FORCE)
+endif ()
 add_subdirectory(spdlog)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spdlog/include/