diff options
| -rw-r--r-- | CHANGELOG.txt | 2 | ||||
| -rw-r--r-- | zp/include/zp/bas | 4 | ||||
| -rw-r--r-- | zp/include/zp/bas.h | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 1af884e..1df0eee 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -149,6 +149,8 @@ * Fix install target; +* Rename nret back to noret; + # 0.0.2 * Migrate to CMake; diff --git a/zp/include/zp/bas b/zp/include/zp/bas index 33c9716..16c43a8 100644 --- a/zp/include/zp/bas +++ b/zp/include/zp/bas @@ -343,8 +343,8 @@ namespace zp { zp_iln constexpr auto iscstevl() noexcept -> bool; // is constant-evaluated #endif - zp_iln zp_nret zp_nthw inline void trp() {::zp_trp();} - zp_iln zp_nret zp_nthw inline void urch() {zp_urch();} + zp_iln zp_noret zp_nthw inline void trp() {::zp_trp();} + zp_iln zp_noret zp_nthw inline void urch() {zp_urch();} #if zp_std_cxx11 // We cannot use template parameter packs before C++11, so this function becomes quite non-trivial to implement. template<typename... typs> zp_iln inline auto syscal(::zp::syscalidt idt,typs const &... args) -> ::zp::syscalres {return ::zp_syscal(idt,args...);} diff --git a/zp/include/zp/bas.h b/zp/include/zp/bas.h index 890c527..ce94d67 100644 --- a/zp/include/zp/bas.h +++ b/zp/include/zp/bas.h @@ -175,15 +175,15 @@ typedef char unsigned zp_prv_bool; #endif #if zp_prv_hasatr(__noreturn__) -#define zp_nret __attribute__ ((__noreturn__)) +#define zp_noret __attribute__ ((__noreturn__)) #elif zp_imp_msvc -#define zp_nret __declspec (noreturn) +#define zp_noret __declspec (noreturn) #elif zp_std_c23 || zp_std_cxx -#define zp_nret [[noreturn]] +#define zp_noret [[noreturn]] #elif zp_std_c99 -#define zp_nret _Noreturn +#define zp_noret _Noreturn #else -#define zp_nret +#define zp_noret #endif #if zp_prv_hasatr(__always_inline__) @@ -319,7 +319,7 @@ typedef decltype (nullptr) zp_nulptrtyp; #define zp_unimax ((zp_c02)+0x10FFFFu) -zp_nret void zp_trp(void); +zp_noret void zp_trp(void); zp_syscalres zp_syscal(zp_syscalidt idt,...); |