Merge pull request #261 from evoskuil/master

evoskuil · web-flow · commit c65b3085980d · 2024-02-11T13:49:41.000-05:00
Make settings virtual, remove dead code.
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)

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ namespace protocol {`
`31`	`31`	`/// Common protocol configuration settings, properties not thread safe.`
`32`	`32`	`struct BCP_API settings`
`33`	`33`	`{`
	`34`	`+ DEFAULT_COPY_MOVE_DESTRUCT(settings);`
	`35`	`+`
`34`	`36`	`settings() NOEXCEPT;`
`35`	`37`	`settings(uint32_t send_high_water, uint32_t receive_high_water) NOEXCEPT;`
`36`	`38`