Merge pull request #261 from evoskuil/master

Make settings virtual, remove dead code.
libbitcoin · Feb 11, 2024 · c65b308 · c65b308
2 parents 77c0121 + 6b74037
commit c65b308
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/include/bitcoin/protocol/settings.hpp b/include/bitcoin/protocol/settings.hpp
@@ -31,6 +31,8 @@ namespace protocol {
 /// Common protocol configuration settings, properties not thread safe.
 struct BCP_API settings
 {
+    DEFAULT_COPY_MOVE_DESTRUCT(settings);
+
     settings() NOEXCEPT;
     settings(uint32_t send_high_water, uint32_t receive_high_water) NOEXCEPT;
 

diff --git a/test/test.hpp b/test/test.hpp
@@ -38,11 +38,6 @@
 #define TEST_PATH \
     TEST_DIRECTORY + "/" + TEST_NAME
 
-#ifdef _MSC_VER
-    #define NO_GLOBAL_INIT_CALLS 26426
-    #define NO_UNUSED_LOCAL_SMART_PTR 26414
-#endif
-
 #ifdef _MSC_VER
     BC_DISABLE_WARNING(NO_ARRAY_INDEXING)
     BC_DISABLE_WARNING(NO_GLOBAL_INIT_CALLS)