Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove TR_LIKELY and TR_UNLIKELY macros (#7469)

Browse Source 
* refactor: remove unused TR_UNLIKELY macro

* refactor: remove TR_LIKELY from assertion macro

https://blog.aaronballman.com/2020/08/dont-use-the-likely-or-unlikely-attributes/

* refactor: remove unuse TR_LIKELY macro

* refactor: remove unused TR_GNUC_CHECK_VERSION macro

* refactor: remove unused __has_builtin fallback macro
This commit is contained in:
Charles Kerr
2025-03-05 08:41:22 -06:00
committed by GitHub
parent 9ea7153ee4
commit 2c0b29143a
2 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libtransmission/tr-assert.h
View File

@@ -13,8 +13,8 @@
[[noreturn]] bool tr_assert_report(std::string_view file, long line, std::string_view message); [[noreturn]] bool tr_assert_report(std::string_view file, long line, std::string_view message);
#define TR_ASSERT(x) ((void)(TR_LIKELY(x) || tr_assert_report(__FILE__, __LINE__, #x))) #define TR_ASSERT(x) ((void)((x) || tr_assert_report(__FILE__, __LINE__, #x)))
#define TR_ASSERT_MSG(x, message) ((void)(TR_LIKELY(x) || tr_assert_report(__FILE__, __LINE__, message))) #define TR_ASSERT_MSG(x, message) ((void)((x) || tr_assert_report(__FILE__, __LINE__, message)))
#define TR_UNREACHABLE() tr_assert_report(__FILE__, __LINE__, "Unreachable code") #define TR_UNREACHABLE() tr_assert_report(__FILE__, __LINE__, "Unreachable code")
#define TR_ENABLE_ASSERTS #define TR_ENABLE_ASSERTS

20
libtransmission/tr-macros.h
View File

@@ -30,22 +30,12 @@
// --- // ---
#ifndef __has_builtin
#define __has_builtin(x) 0
#endif
#ifdef _WIN32 #ifdef _WIN32
#define TR_IF_WIN32(ThenValue, ElseValue) ThenValue #define TR_IF_WIN32(ThenValue, ElseValue) ThenValue
#else #else
#define TR_IF_WIN32(ThenValue, ElseValue) ElseValue #define TR_IF_WIN32(ThenValue, ElseValue) ElseValue
#endif #endif
#ifdef __GNUC__
#define TR_GNUC_CHECK_VERSION(major, minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
#else
#define TR_GNUC_CHECK_VERSION(major, minor) 0
#endif
#ifdef __UCLIBC__ #ifdef __UCLIBC__
#define TR_UCLIBC_CHECK_VERSION(major, minor, micro) \ #define TR_UCLIBC_CHECK_VERSION(major, minor, micro) \
(__UCLIBC_MAJOR__ > (major) || (__UCLIBC_MAJOR__ == (major) && __UCLIBC_MINOR__ > (minor)) || \ (__UCLIBC_MAJOR__ > (major) || (__UCLIBC_MAJOR__ == (major) && __UCLIBC_MINOR__ > (minor)) || \
@@ -56,16 +46,6 @@
// --- // ---
#if __has_builtin(__builtin_expect) || TR_GNUC_CHECK_VERSION(3, 0)
#define TR_LIKELY(x) __builtin_expect((x) ? 1L : 0L, 1L)
#define TR_UNLIKELY(x) __builtin_expect((x) ? 1L : 0L, 0L)
#else
#define TR_LIKELY(x) (x)
#define TR_UNLIKELY(x) (x)
#endif
// ---
#define TR_INET6_ADDRSTRLEN 46 #define TR_INET6_ADDRSTRLEN 46
#define TR_ADDRSTRLEN 64 #define TR_ADDRSTRLEN 64