Capitalize UNREACHABLE() macro

Avoids conflict with C++23 std::unreachable()
MusicPlayerDaemon · Dec 5, 2024 · 4469242 · 4469242
1 parent 12b2d37
commit 4469242
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Log.cxx b/src/Log.cxx
@@ -79,7 +79,7 @@ ToSyslog(LogLevel log_level) noexcept
 		return LOG_DEBUG;
 	}
 
-	unreachable();
+	UNREACHABLE();
 }
 
 static void

diff --git a/src/ReadConfig.cxx b/src/ReadConfig.cxx
@@ -333,7 +333,7 @@ load_ignore_list(const std::string& path, Config::IgnoreListMap& ignore_lists)
 						case 0: entry_non_empty = true; entry.artist = token; break;
 						case 1: entry_non_empty = true; entry.album = token; break;
 						case 2: entry_non_empty = true; entry.title = token; break;
-						default: unreachable();
+						default: UNREACHABLE();
 					}
 				}
 

diff --git a/src/lib/curl/Global.cxx b/src/lib/curl/Global.cxx
@@ -76,7 +76,7 @@ class CurlSocket final {
 		}
 
 		assert(false);
-		unreachable();
+		UNREACHABLE();
 	}
 };
 

diff --git a/src/util/Compiler.h b/src/util/Compiler.h
@@ -42,11 +42,11 @@
 #endif
 
 #if defined(__GNUC__) || defined(__clang__)
-#define unreachable() __builtin_unreachable()
+#define UNREACHABLE() __builtin_unreachable()
 #elif defined(_MSVC_VER)
-#define unreachable() __assume(false)
+#define UNREACHABLE() __assume(false)
 #else
-#define unreachable()
+#define UNREACHABLE()
 #endif
 
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,7 +76,7 @@ class CurlSocket final { @@
     		}
     		assert(false);
-    		unreachable();
+    		UNREACHABLE();
     	}
     };
@@ Expand Down @@