blob: a919f4f6fbfe398da44d4f2dbcabbca2b29c5093 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From 2ac63f8765e62f1492ef3ee06791636700bc6cfb Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 29 Jun 2024 15:25:24 +0100
Subject: [PATCH] Cast offset to size_t to avoid c++11-narrowing warning (#92)
e.g. with clang 18 on chimera linux:
_CFFI_test_verify_anonymous_struct_with_star_typedef.cpp:583:10: error: non-constant-expression cannot be narrowed from type 'long' to 'size_t' (aka 'unsigned long') in initializer list [-Wc++11-narrowing]
583 | { "a", ((char *)&((foo_t)4096)->a) - (char *)4096,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_CFFI_test_verify_anonymous_struct_with_star_typedef.cpp:583:10: note: insert an explicit cast to silence this issue
583 | { "a", ((char *)&((foo_t)4096)->a) - (char *)4096,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| static_cast<size_t>( )
Upstream-Status: Backport [https://github.com/python-cffi/cffi/pull/92]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/cffi/recompiler.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cffi/recompiler.py b/src/cffi/recompiler.py
index ac6c163e..14d578ee 100644
--- a/src/cffi/recompiler.py
+++ b/src/cffi/recompiler.py
@@ -953,7 +953,7 @@ class Recompiler:
if cname is None or fbitsize >= 0:
offset = '(size_t)-1'
elif named_ptr is not None:
- offset = '((char *)&((%s)4096)->%s) - (char *)4096' % (
+ offset = '(size_t)(((char *)&((%s)4096)->%s) - (char *)4096)' % (
named_ptr.name, fldname)
else:
offset = 'offsetof(%s, %s)' % (tp.get_c_name(''), fldname)
|