Merged revisions 62013-62014 via svnmerge from

loewis · loewis · commit 617fa91d89b5 · 2008-03-30T20:29:36.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62013 | amaury.forgeotdarc | 2008-03-28 21:17:51 +0100 (Fr, 28 Mär 2008) | 2 lines

  Silence a compilation warning
........
  r62014 | georg.brandl | 2008-03-28 21:22:56 +0100 (Fr, 28 Mär 2008) | 2 lines

  Silence compiler warning at the source.
........
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -938,7 +938,7 @@ class PartingShots(StaticVisitor):
 {
     mod_ty res;
     init_types();
-    if (!PyObject_IsInstance(ast, mod_type)) {
+    if (!PyObject_IsInstance(ast, (PyObject*)mod_type)) {
         PyErr_SetString(PyExc_TypeError, "expected either Module, Interactive "
                         "or Expression node");
         return NULL;
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
@@ -6419,7 +6419,7 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena)
 {
     mod_ty res;
     init_types();
-    if (!PyObject_IsInstance(ast, mod_type)) {
+    if (!PyObject_IsInstance(ast, (PyObject*)mod_type)) {
         PyErr_SetString(PyExc_TypeError, "expected either Module, Interactive "
                         "or Expression node");
         return NULL;

Original file line number	Diff line number	Diff line change
`@@ -938,7 +938,7 @@ class PartingShots(StaticVisitor):`
`938`	`938`	`{`
`939`	`939`	`mod_ty res;`
`940`	`940`	`init_types();`
`941`		`- if (!PyObject_IsInstance(ast, mod_type)) {`
	`941`	`+ if (!PyObject_IsInstance(ast, (PyObject*)mod_type)) {`
`942`	`942`	`PyErr_SetString(PyExc_TypeError, "expected either Module, Interactive "`
`943`	`943`	`"or Expression node");`
`944`	`944`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -6419,7 +6419,7 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena)`
`6419`	`6419`	`{`
`6420`	`6420`	`mod_ty res;`
`6421`	`6421`	`init_types();`
`6422`		`- if (!PyObject_IsInstance(ast, mod_type)) {`
	`6422`	`+ if (!PyObject_IsInstance(ast, (PyObject*)mod_type)) {`
`6423`	`6423`	`PyErr_SetString(PyExc_TypeError, "expected either Module, Interactive "`
`6424`	`6424`	`"or Expression node");`
`6425`	`6425`	`return NULL;`