Merge pull request #17 from cschreib/update

Update snatch to v0.1.3

Author: cschreib

oup.sublime-project

@@ -67,11 +67,11 @@
 				},
 				{
 					"name": "oup_speed_benchmark",
-					"shell_cmd": "make -j12 oup_speed_benchmark"
+					"shell_cmd": "make -j12 oup_speed_benchmark",
 				},
 				{
 					"name": "snatch",
-					"shell_cmd": "make -j12 snatch"
+					"shell_cmd": "make -j12 snatch",
 				},
 			],
 			"working_dir": "$folder/build",

tests/CMakeLists.txt

@@ -33,7 +33,7 @@ include(FetchContent)
 
 FetchContent_Declare(snatch
                      GIT_REPOSITORY https://github.com/cschreib/snatch.git
-                     GIT_TAG        v0.1.0)
+                     GIT_TAG        v0.1.3)
 FetchContent_MakeAvailable(snatch)
 
 set(RUNTIME_TEST_FILES

tests/runtime_tests_observer_assignment_copy.cpp

@@ -217,10 +217,10 @@ TEMPLATE_LIST_TEST_CASE(
     {
         TestType               ptr = make_pointer_deleter_1<TestType>();
         observer_ptr<TestType> optr{ptr};
-        WARNING_PUSH;
-        WARNING_DISABLE_SELF_ASSIGN;
+        SNATCH_WARNING_PUSH;
+        SNATCH_WARNING_DISABLE_SELF_ASSIGN;
         optr = optr;
-        WARNING_POP;
+        SNATCH_WARNING_POP;
 
         CHECK(optr.get() == ptr.get());
         CHECK(optr.expired() == false);
@@ -236,10 +236,10 @@ TEMPLATE_LIST_TEST_CASE(
 
     {
         observer_ptr<TestType> optr;
-        WARNING_PUSH;
-        WARNING_DISABLE_SELF_ASSIGN;
+        SNATCH_WARNING_PUSH;
+        SNATCH_WARNING_DISABLE_SELF_ASSIGN;
         optr = optr;
-        WARNING_POP;
+        SNATCH_WARNING_POP;
 
         CHECK(optr.get() == nullptr);
         CHECK(optr.expired() == true);

tests/tests_common.hpp

@@ -631,12 +631,12 @@ using owner_types = std::tuple<
 
 // clang-format off
 #if defined(__clang__)
-#    define WARNING_DISABLE_SELF_ASSIGN _Pragma("clang diagnostic ignored \"-Wself-assign-overloaded\"")
+#    define SNATCH_WARNING_DISABLE_SELF_ASSIGN _Pragma("clang diagnostic ignored \"-Wself-assign-overloaded\"")
 #elif defined(__GNUC__)
-#    define WARNING_DISABLE_SELF_ASSIGN do {} while (0)
+#    define SNATCH_WARNING_DISABLE_SELF_ASSIGN do {} while (0)
 #elif defined(_MSC_VER)
-#    define WARNING_DISABLE_SELF_ASSIGN do {} while (0)
+#    define SNATCH_WARNING_DISABLE_SELF_ASSIGN do {} while (0)
 #else
-#    define WARNING_DISABLE_SELF_ASSIGN do {} while (0)
+#    define SNATCH_WARNING_DISABLE_SELF_ASSIGN do {} while (0)
 #endif
 // clang-format on