jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

all: various cleanups

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2023-10-30 12:17:51 +01:00
parent 38a676f6f7
commit 37b923245d
7 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/xspan.h
+6 -6
View File
@@ -130,15 +130,15 @@ using XSPAN_NAMESPACE_NAME::raw_index_bytes; // overloaded for all classes
// helper for implicit pointer conversions and MemBuffer overloads
template <class R, class T>
inline R *xspan_make_helper__(R * /*dummy*/, T *first) may_throw {
inline R *xspan_make_helper__(T *first) noexcept {
return first; // IMPORTANT: no cast here to detect bad usage
}
template <class R>
inline R *xspan_make_helper__(R * /*dummy*/, std::nullptr_t /*first*/) noexcept {
inline R *xspan_make_helper__(std::nullptr_t /*first*/) noexcept {
return nullptr;
}
template <class R>
inline R *xspan_make_helper__(R * /*dummy*/, MemBuffer &mb) noexcept {
inline R *xspan_make_helper__(MemBuffer &mb) noexcept {
return (R *) membuffer_get_void_ptr(mb);
}
@@ -148,9 +148,9 @@ inline R *xspan_make_helper__(R * /*dummy*/, MemBuffer &mb) noexcept {
#define XSPAN_S(type) type *
// create a value
#define XSPAN_0_MAKE(type, first, ...) (xspan_make_helper__((type *) nullptr, (first)))
#define XSPAN_P_MAKE(type, first, ...) (xspan_make_helper__((type *) nullptr, (first)))
#define XSPAN_S_MAKE(type, first, ...) (xspan_make_helper__((type *) nullptr, (first)))
#define XSPAN_0_MAKE(type, first, ...) (xspan_make_helper__<type>((first)))
#define XSPAN_P_MAKE(type, first, ...) (xspan_make_helper__<type>((first)))
#define XSPAN_S_MAKE(type, first, ...) (xspan_make_helper__<type>((first)))
// define a variable
#define XSPAN_0_VAR(type, var, first, ...) type *var = XSPAN_0_MAKE(type, (first))