Merge pull request #733 from mdboom/clang-py3-fixes

mdboom · mdboom · commit 80d1a7cc6d2f · 2012-03-01T13:25:37.000-08:00
Issues compiling with clang + Python 3.x
diff --git a/CXX/Python3/Objects.hxx b/CXX/Python3/Objects.hxx
@@ -413,7 +413,7 @@ namespace Py
         {
         }
 
-        bool accepts( PyObject *pyob )
+        virtual bool accepts( PyObject *pyob ) const
         {
             return pyob == NULL;
         }
@@ -1520,7 +1520,7 @@ namespace Py
 
             int operator-( const iterator &other ) const
             {
-                if( seq.ptr() != other.seq.ptr() )
+              if( seq->ptr() != other.seq->ptr() )
                     throw RuntimeError( "SeqBase<T>::iterator comparison error" );
 
                 return count - other.count;

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ namespace Py`
`413`	`413`	`{`
`414`	`414`	`}`
`415`	`415`
`416`		`- bool accepts( PyObject *pyob )`
	`416`	`+ virtual bool accepts( PyObject *pyob ) const`
`417`	`417`	`{`
`418`	`418`	`return pyob == NULL;`
`419`	`419`	`}`
`@@ -1520,7 +1520,7 @@ namespace Py`
`1520`	`1520`
`1521`	`1521`	`int operator-( const iterator &other ) const`
`1522`	`1522`	`{`
`1523`		`- if( seq.ptr() != other.seq.ptr() )`
	`1523`	`+ if( seq->ptr() != other.seq->ptr() )`
`1524`	`1524`	`throw RuntimeError( "SeqBase<T>::iterator comparison error" );`
`1525`	`1525`
`1526`	`1526`	`return count - other.count;`