Commit 80ec45f5 authored by Tres Seaver's avatar Tres Seaver

Suppressed warnings about signedness of characters when compiling under GCC 4.0.x.

See http://www.zope.org/Collectors/Zope/2027.
parent 5abf25f2
......@@ -10,6 +10,9 @@ development) since ZODB 3.4's last public release:
PersistentMapping
-----------------
- (3.4.3b1) Suppressed warnings about signedness of characters when compiling
under GCC 4.0.x (http://www.zope.org/Collectors/Zope/2027).
- (3.4.3b1) Made new tests ``test_mapping`` conform to the requirements for
a ``dict`` initializer in Python 2.3.x.
......
......@@ -45,7 +45,7 @@ typedef unsigned char char6[6];
#define DECREF_KEY(KEY)
#define INCREF_KEY(k)
#define COPY_KEY(KEY, E) (*(KEY)=*(E), (KEY)[1]=(E)[1])
#define COPY_KEY_TO_OBJECT(O, K) O=PyString_FromStringAndSize(K,2)
#define COPY_KEY_TO_OBJECT(O, K) O=PyString_FromStringAndSize((const char*)K,2)
#define COPY_KEY_FROM_ARG(TARGET, ARG, STATUS) \
if (KEY_CHECK(ARG)) memcpy(TARGET, PyString_AS_STRING(ARG), 2); else { \
PyErr_SetString(PyExc_TypeError, "expected two-character string key"); \
......@@ -59,7 +59,7 @@ typedef unsigned char char6[6];
#define DECREF_VALUE(k)
#define INCREF_VALUE(k)
#define COPY_VALUE(V, E) (memcpy(V, E, 6))
#define COPY_VALUE_TO_OBJECT(O, K) O=PyString_FromStringAndSize(K,6)
#define COPY_VALUE_TO_OBJECT(O, K) O=PyString_FromStringAndSize((const char*)K,6)
#define COPY_VALUE_FROM_ARG(TARGET, ARG, STATUS) \
if ((PyString_Check(ARG) && PyString_GET_SIZE(ARG)==6)) \
memcpy(TARGET, PyString_AS_STRING(ARG), 6); else { \
......
......@@ -218,7 +218,7 @@ TimeStamp_timeTime(TimeStamp *self)
static PyObject *
TimeStamp_raw(TimeStamp *self)
{
return PyString_FromStringAndSize(self->data, 8);
return PyString_FromStringAndSize((const char*)self->data, 8);
}
static PyObject *
......@@ -261,7 +261,7 @@ TimeStamp_laterThan(TimeStamp *self, PyObject *obj)
new[i] = 0;
else {
new[i]++;
return TimeStamp_FromString(new);
return TimeStamp_FromString((const char*)new);
}
}
......
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