Commit bd50b31c authored by Stefan Behnel's avatar Stefan Behnel

merge

parents a1cbd37f 662e5883
cdef void f(obj): cdef void f(obj):
cdef int i=0 cdef size_t i=0
cdef char *p cdef char *p
p = <char *>i p = <char *>i
p = <char *>&i p = <char *>&i
......
...@@ -65,10 +65,10 @@ def test_unsigned_long(): ...@@ -65,10 +65,10 @@ def test_unsigned_long():
cdef int i cdef int i
cdef unsigned long ix cdef unsigned long ix
cdef D = {} cdef D = {}
for i from 0 <= i < sizeof(unsigned long) * 8: for i from 0 <= i < <int>sizeof(unsigned long) * 8:
ix = (<unsigned long>1) << i ix = (<unsigned long>1) << i
D[ix] = True D[ix] = True
for i from 0 <= i < sizeof(unsigned long) * 8: for i from 0 <= i < <int>sizeof(unsigned long) * 8:
ix = (<unsigned long>1) << i ix = (<unsigned long>1) << i
assert D[ix] is True assert D[ix] is True
del D[ix] del D[ix]
...@@ -78,10 +78,10 @@ def test_unsigned_short(): ...@@ -78,10 +78,10 @@ def test_unsigned_short():
cdef int i cdef int i
cdef unsigned short ix cdef unsigned short ix
cdef D = {} cdef D = {}
for i from 0 <= i < sizeof(unsigned short) * 8: for i from 0 <= i < <int>sizeof(unsigned short) * 8:
ix = (<unsigned short>1) << i ix = (<unsigned short>1) << i
D[ix] = True D[ix] = True
for i from 0 <= i < sizeof(unsigned short) * 8: for i from 0 <= i < <int>sizeof(unsigned short) * 8:
ix = (<unsigned short>1) << i ix = (<unsigned short>1) << i
assert D[ix] is True assert D[ix] is True
del D[ix] del D[ix]
...@@ -91,10 +91,10 @@ def test_long_long(): ...@@ -91,10 +91,10 @@ def test_long_long():
cdef int i cdef int i
cdef long long ix cdef long long ix
cdef D = {} cdef D = {}
for i from 0 <= i < sizeof(long long) * 8: for i from 0 <= i < <int>sizeof(long long) * 8:
ix = (<long long>1) << i ix = (<long long>1) << i
D[ix] = True D[ix] = True
for i from 0 <= i < sizeof(long long) * 8: for i from 0 <= i < <int>sizeof(long long) * 8:
ix = (<long long>1) << i ix = (<long long>1) << i
assert D[ix] is True assert D[ix] is True
del D[ix] del D[ix]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment