diff options
| author | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2024-05-14 00:00:00 +0000 |
|---|---|---|
| committer | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2024-05-15 23:55:04 +0500 |
| commit | fc662341e6f85da78ada0e443f6116b978f79f22 (patch) | |
| tree | 1be1cc402a7a9cbc18d4eeea6b141354c2d559e3 /C/7zTypes.h | |
| parent | 5b39dc76f1bc82f941d5c800ab9f34407a06b53a (diff) | |
| download | 7zip-24.05.tar.gz 7zip-24.05.tar.bz2 7zip-24.05.zip | |
24.0524.05
Diffstat (limited to 'C/7zTypes.h')
| -rw-r--r-- | C/7zTypes.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/C/7zTypes.h b/C/7zTypes.h index 1fcb247..5b77420 100644 --- a/C/7zTypes.h +++ b/C/7zTypes.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* 7zTypes.h -- Basic types | 1 | /* 7zTypes.h -- Basic types |
| 2 | 2023-04-02 : Igor Pavlov : Public domain */ | 2 | 2024-01-24 : Igor Pavlov : Public domain */ |
| 3 | 3 | ||
| 4 | #ifndef ZIP7_7Z_TYPES_H | 4 | #ifndef ZIP7_7Z_TYPES_H |
| 5 | #define ZIP7_7Z_TYPES_H | 5 | #define ZIP7_7Z_TYPES_H |
| @@ -530,20 +530,20 @@ struct ISzAlloc | |||
| 530 | #define Z7_CONTAINER_FROM_VTBL_CLS(ptr, type, m) Z7_CONTAINER_FROM_VTBL(ptr, type, m) | 530 | #define Z7_CONTAINER_FROM_VTBL_CLS(ptr, type, m) Z7_CONTAINER_FROM_VTBL(ptr, type, m) |
| 531 | */ | 531 | */ |
| 532 | #if defined (__clang__) || defined(__GNUC__) | 532 | #if defined (__clang__) || defined(__GNUC__) |
| 533 | #define Z7_DIAGNOSCTIC_IGNORE_BEGIN_CAST_QUAL \ | 533 | #define Z7_DIAGNOSTIC_IGNORE_BEGIN_CAST_QUAL \ |
| 534 | _Pragma("GCC diagnostic push") \ | 534 | _Pragma("GCC diagnostic push") \ |
| 535 | _Pragma("GCC diagnostic ignored \"-Wcast-qual\"") | 535 | _Pragma("GCC diagnostic ignored \"-Wcast-qual\"") |
| 536 | #define Z7_DIAGNOSCTIC_IGNORE_END_CAST_QUAL \ | 536 | #define Z7_DIAGNOSTIC_IGNORE_END_CAST_QUAL \ |
| 537 | _Pragma("GCC diagnostic pop") | 537 | _Pragma("GCC diagnostic pop") |
| 538 | #else | 538 | #else |
| 539 | #define Z7_DIAGNOSCTIC_IGNORE_BEGIN_CAST_QUAL | 539 | #define Z7_DIAGNOSTIC_IGNORE_BEGIN_CAST_QUAL |
| 540 | #define Z7_DIAGNOSCTIC_IGNORE_END_CAST_QUAL | 540 | #define Z7_DIAGNOSTIC_IGNORE_END_CAST_QUAL |
| 541 | #endif | 541 | #endif |
| 542 | 542 | ||
| 543 | #define Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR(ptr, type, m, p) \ | 543 | #define Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR(ptr, type, m, p) \ |
| 544 | Z7_DIAGNOSCTIC_IGNORE_BEGIN_CAST_QUAL \ | 544 | Z7_DIAGNOSTIC_IGNORE_BEGIN_CAST_QUAL \ |
| 545 | type *p = Z7_CONTAINER_FROM_VTBL(ptr, type, m); \ | 545 | type *p = Z7_CONTAINER_FROM_VTBL(ptr, type, m); \ |
| 546 | Z7_DIAGNOSCTIC_IGNORE_END_CAST_QUAL | 546 | Z7_DIAGNOSTIC_IGNORE_END_CAST_QUAL |
| 547 | 547 | ||
| 548 | #define Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(type) \ | 548 | #define Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(type) \ |
| 549 | Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR(pp, type, vt, p) | 549 | Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR(pp, type, vt, p) |