Merge pull request #44 from sparcians/dev/bdutro/fix-stfpy-cython-0.29

Fix stfpy compilation errors when using Cython 0.29.x
sparcians · Aug 9, 2024 · 83bb798 · 83bb798
2 parents ea95fa6 + 7fc346a
commit 83bb798
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/stfpy/stfpy/stf_inst_reader.pxd b/stfpy/stfpy/stf_inst_reader.pxd
@@ -13,8 +13,8 @@ cdef class HeaderCommentsTypeIterator:
     @staticmethod
     cdef inline HeaderCommentsTypeIterator _construct(const _HeaderCommentsType* vec):
         it = HeaderCommentsTypeIterator()
-        it.c_it = dereference(vec).begin()
-        it.c_end_it = dereference(vec).end()
+        it.c_it = dereference(vec).const_begin()
+        it.c_end_it = dereference(vec).const_end()
         return it
 
 cdef class HeaderCommentsType:

diff --git a/stfpy/stfpy/stf_lib/stf_inst_reader.pxd b/stfpy/stfpy/stf_lib/stf_inst_reader.pxd
@@ -2,7 +2,7 @@
 
 from libc.stdint cimport *
 from libcpp.vector cimport vector
-from cython.cimports.libcpp.string import string
+from libcpp.string cimport string
 from stfpy.stf_lib.stf_inst cimport STFInst
 
 ctypedef vector[string] HeaderCommentsType