Merge branch 'clang16' into gcc-14

sagemath · Mar 30, 2024 · d17b927 · d17b927
2 parents f45874a + 39db3c5
commit d17b927
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/src/sage/modular/arithgroup/farey.cpp b/src/sage/modular/arithgroup/farey.cpp
@@ -24,6 +24,7 @@
 #include <sstream>
 #include <algorithm>
 #include <cassert>
+#include <functional>
 
 #include <gmpxx.h>
 #include <Python.h>
@@ -737,7 +738,7 @@ size_t FareySymbol::nu3() const {
 size_t FareySymbol::rank_pi() const {
   if( index() == 2 ) return 1;
   return count_if(pairing.begin(), pairing.end(),
-                  bind2nd(greater<int>(), 0))/2;
+                  bind(greater<int>(), placeholders::_1, 0))/2;
 }
 
 size_t FareySymbol::number_of_cusps() const {

diff --git a/src/sage/modular/arithgroup/farey_symbol.pyx b/src/sage/modular/arithgroup/farey_symbol.pyx
@@ -1,4 +1,6 @@
 # distutils: sources = sage/modular/arithgroup/sl2z.cpp sage/modular/arithgroup/farey.cpp
+# distutils: language = c++
+# distutils: extra_compile_args = -std=c++11
 # sage.doctest: needs sage.libs.pari
 r"""
 Farey symbol for arithmetic subgroups of `\PSL_2(\ZZ)`

diff --git a/src/sage/rings/polynomial/hilbert.pyx b/src/sage/rings/polynomial/hilbert.pyx
@@ -106,7 +106,7 @@ cdef inline list interred(list L) noexcept:
     # that appears later in L.
     if not L:
         return []
-    L.sort(key=ETuple.unweighted_degree)
+    L.sort(key=ETuple._unweighted_degree)
     cdef size_t i
     cdef ETuple m
     cdef list result = [<ETuple> PyList_GET_ITEM(L, 0)]

diff --git a/src/sage/rings/polynomial/polydict.pxd b/src/sage/rings/polynomial/polydict.pxd
@@ -14,6 +14,8 @@ cdef class ETuple:
     cdef ETuple _new(self) noexcept
     cdef int get_exp(self, size_t i) noexcept
 
+    # need a cdef version for function pointers
+    cdef int _unweighted_degree(self) except *
     cpdef int unweighted_degree(self) except *
     cpdef int weighted_degree(self, tuple w) except *
     cpdef int unweighted_quotient_degree(self, ETuple other) except *

diff --git a/src/sage/rings/polynomial/polydict.pyx b/src/sage/rings/polynomial/polydict.pyx
@@ -1845,7 +1845,7 @@ cdef class ETuple:
 
     # additional methods
 
-    cpdef int unweighted_degree(self) except *:
+    cdef int _unweighted_degree(self) except *:
         r"""
         Return the sum of entries.
 
@@ -1863,6 +1863,20 @@ cdef class ETuple:
             degree += self._data[2 * i + 1]
         return degree
 
+    cpdef int unweighted_degree(self) except *:
+        r"""
+        Return the sum of entries.
+
+        EXAMPLES::
+
+             sage: from sage.rings.polynomial.polydict import ETuple
+             sage: ETuple([1, 1, 0, 2, 0]).unweighted_degree()
+             4
+             sage: ETuple([-1, 1]).unweighted_degree()
+             0
+        """
+        return self._unweighted_degree()
+
     @cython.boundscheck(False)
     @cython.wraparound(False)
     cpdef int weighted_degree(self, tuple w) except *: