jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: "and" is not available in all compilers.

Browse source
This commit is contained in:
Siu Kwan Lam 2013-02-27 19:31:26 -06:00
commit d9c2ec696d
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
llvmpy/include/llvm_binding/conversion.h
View file

@ -90,7 +90,7 @@ int py_str_to(PyObject *strobj, const char* &strref){
static static
int py_int_to(PyObject *intobj, int64_t & val){ int py_int_to(PyObject *intobj, int64_t & val){
if (!PyInt_Check(intobj) and !PyLong_Check(intobj)) { if (!PyInt_Check(intobj) && !PyLong_Check(intobj)) {
// raise TypeError // raise TypeError
PyErr_SetString(PyExc_TypeError, "Expecting an int"); PyErr_SetString(PyExc_TypeError, "Expecting an int");
return 0; return 0;
@ -111,7 +111,7 @@ int py_int_to(PyObject *intobj, int64_t & val){
static static
int py_int_to(PyObject *intobj, unsigned & val){ int py_int_to(PyObject *intobj, unsigned & val){
if (!PyInt_Check(intobj) and !PyLong_Check(intobj)) { if (!PyInt_Check(intobj) && !PyLong_Check(intobj)) {
// raise TypeError // raise TypeError
PyErr_SetString(PyExc_TypeError, "Expecting an int"); PyErr_SetString(PyExc_TypeError, "Expecting an int");
return 0; return 0;
@ -123,7 +123,7 @@ int py_int_to(PyObject *intobj, unsigned & val){
static static
int py_int_to(PyObject *intobj, unsigned long long & val){ int py_int_to(PyObject *intobj, unsigned long long & val){
if (!PyInt_Check(intobj) and !PyLong_Check(intobj)) { if (!PyInt_Check(intobj) && !PyLong_Check(intobj)) {
// raise TypeError; // raise TypeError;
PyErr_SetString(PyExc_TypeError, "Expecting an int"); PyErr_SetString(PyExc_TypeError, "Expecting an int");
return 0; return 0;
@ -148,7 +148,7 @@ int py_int_to(PyObject *intobj, unsigned long & val){
static static
int py_int_to(PyObject *intobj, void* & val){ int py_int_to(PyObject *intobj, void* & val){
if (!PyInt_Check(intobj) and !PyLong_Check(intobj)) { if (!PyInt_Check(intobj) && !PyLong_Check(intobj)) {
// raise TypeError // raise TypeError
PyErr_SetString(PyExc_TypeError, "Expecting an int"); PyErr_SetString(PyExc_TypeError, "Expecting an int");
return 0; return 0;

2
llvmpy/include/llvm_binding/extra.h
View file

@ -201,7 +201,7 @@ struct extract {
if (!item) { if (!item) {
return false; return false;
} }
if (accept_null and Py_None == *item) { if (accept_null && Py_None == *item) {
vec.push_back(NULL); vec.push_back(NULL);
} else { } else {
auto_pyobject capsule = PyObject_GetAttrString(*item, "_ptr"); auto_pyobject capsule = PyObject_GetAttrString(*item, "_ptr");