one more fix of conditions for formatting

brainboxdotcc · Jul 18, 2024 · 1a70ef2 · 1a70ef2
1 parent 89d5f60
commit 1a70ef2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/include/dpp/snowflake.h b/include/dpp/snowflake.h
@@ -285,13 +285,12 @@ struct std::hash<dpp::snowflake>
 #if __cplusplus >= 202002L
 //fix for https://github.com/llvm/llvm-project/issues/77773 and
 // apple support on clang 14 https://developer.apple.com/xcode/cpp/
-#if (!defined(__clang__) || \
-        (defined(__clang__) && ((__clang_major__ >= 15 && defined(__APPLE__)) || (__clang_major__ >= 14 && !defined(__APPLE__))))) && (defined(__cpp_lib_format) || \
-        (__has_include(<format>)))
+#if (defined(__cpp_lib_format) || \
+        (defined(__clang__) && __clang_major__ >= 14 && !defined(__APPLE__) && __has_include(<format>)))
 #include <format>
 
 /*
- * @brief implementation of formater for dpp::snowlfake for std::format support
+ * @brief implementation of formater for dpp::snowflake for std::format support
  * https://en.cppreference.com/w/cpp/utility/format/formatter
  */
 template <>

diff --git a/src/unittest/test.cpp b/src/unittest/test.cpp
@@ -385,9 +385,9 @@ Markdown lol \\|\\|spoiler\\|\\| \\~\\~strikethrough\\~\\~ \\`small \\*code\\* b
 
                 //fix for https://github.com/llvm/llvm-project/issues/77773 and
                 // apple support on clang 14 https://developer.apple.com/xcode/cpp/
-                #if (!defined(__clang__) || \
-                        (defined(__clang__) && ((__clang_major__ >= 15 && defined(__APPLE__)) || (__clang_major__ >= 14 && !defined(__APPLE__))))) && (defined(__cpp_lib_format) || \
-                        (__has_include(<format>)))
+                #if (defined(__cpp_lib_format) || \
+                        (defined(__clang__) && __clang_major__ >= 14 && !defined(__APPLE__) && __has_include(<format>)))
+
                         set_test(SNOWFLAKE_STD_FORMAT,
                             std::format("{}",dpp::snowflake{}) == "0" &&
                             std::format("{}",dpp::snowflake{12345}) == "12345" &&
@@ -800,7 +800,7 @@ Markdown lol \\|\\|spoiler\\|\\| \\~\\~strikethrough\\~\\~ \\`small \\*code\\* b
 				 m5.get_url() == "" &&
 				 m6.get_url() == "" &&
 				 m7.get_url() == "" &&
-				 m8.get_url() == "" 
+				 m8.get_url() == ""
 		);
 	}
 
@@ -910,31 +910,31 @@ Markdown lol \\|\\|spoiler\\|\\| \\~\\~strikethrough\\~\\~ \\`small \\*code\\* b
 
 		set_test(UTILITY_USER_URL, false);
 		auto user_url = dpp::utility::user_url(123);
-		set_test(UTILITY_USER_URL, 
-				 user_url == dpp::utility::url_host + "/users/123" && 
+		set_test(UTILITY_USER_URL,
+				 user_url == dpp::utility::url_host + "/users/123" &&
 				 dpp::utility::user_url(0) == ""
 		);
 
 		set_test(UTILITY_MESSAGE_URL, false);
 		auto message_url = dpp::utility::message_url(1,2,3);
 		set_test(UTILITY_MESSAGE_URL,
-				 message_url == dpp::utility::url_host+ "/channels/1/2/3" && 
+				 message_url == dpp::utility::url_host+ "/channels/1/2/3" &&
 				 dpp::utility::message_url(0,2,3) == "" &&
-				 dpp::utility::message_url(1,0,3) == "" && 
+				 dpp::utility::message_url(1,0,3) == "" &&
 				 dpp::utility::message_url(1,2,0) == "" &&
 				 dpp::utility::message_url(0,0,3) == "" &&
 				 dpp::utility::message_url(0,2,0) == "" &&
 				 dpp::utility::message_url(1,0,0) == "" &&
-				 dpp::utility::message_url(0,0,0) == "" 
+				 dpp::utility::message_url(0,0,0) == ""
 		);
 
 		set_test(UTILITY_CHANNEL_URL, false);
 		auto channel_url = dpp::utility::channel_url(1,2);
-		set_test(UTILITY_CHANNEL_URL, 
+		set_test(UTILITY_CHANNEL_URL,
 				 channel_url == dpp::utility::url_host+ "/channels/1/2" &&
 				 dpp::utility::channel_url(0,2) == "" &&
 				 dpp::utility::channel_url(1,0) == "" &&
-				 dpp::utility::channel_url(0,0) == "" 
+				 dpp::utility::channel_url(0,0) == ""
 		);
 
 		set_test(UTILITY_THREAD_URL, false);
@@ -943,7 +943,7 @@ Markdown lol \\|\\|spoiler\\|\\| \\~\\~strikethrough\\~\\~ \\`small \\*code\\* b
 				 thread_url == dpp::utility::url_host+ "/channels/1/2" &&
 				 dpp::utility::thread_url(0,2) == "" &&
 				 dpp::utility::thread_url(1,0) == "" &&
-				 dpp::utility::thread_url(0,0) == "" 
+				 dpp::utility::thread_url(0,0) == ""
 		);
 	}
 
@@ -1672,7 +1672,7 @@ Markdown lol \\|\\|spoiler\\|\\| \\~\\~strikethrough\\~\\~ \\`small \\*code\\* b
 									set_test(TIMESTAMP, false);
 								}
 							} else {
-								set_test(MESSAGESGET, false);	
+								set_test(MESSAGESGET, false);
 							}
 						}  else {
 							set_test(MESSAGESGET, false);