Ticket #3676: trac3676-bitset_pxd.patch

sage/groups/perm_gps/partn_ref/tree_traversal.pxd

@@ -8 +8 @@
 
 include '../../../ext/cdefs.pxi'
 include '../../../ext/stdsage.pxi'
+include '../../../misc/bitset_pxd.pxi'
+
 from sage.rings.integer cimport Integer
 
 cdef struct OrbitPartition:
@@ -50 +52 @@
 cdef inline bint PS_is_fixed(PartitionStack *, int)
 cdef inline int PS_clear(PartitionStack *)
 cdef inline int PS_split_point(PartitionStack *, int)
-#cdef inline int PS_first_smallest(PartitionStack *, bitset_t)
+cdef inline int PS_first_smallest(PartitionStack *, bitset_t)
 cdef inline int PS_get_perm_from(PartitionStack *, PartitionStack *, int *)
 
 cdef inline int split_point_and_refine(PartitionStack *, int, object,

sage/misc/bitset.pxi

@@ -16 +16 @@
 
 
 # This is a .pxi file so that one can inline functions. Doctests in misc_c. 
-
-include "../ext/stdsage.pxi"
-
-cdef extern from *:
-    void *memset(void *, int, size_t)
-    void *memcpy(void *, void *, size_t)
-    int memcmp(void *, void *, size_t)
-    size_t strlen(char *)
-
-    # constant literals
-    int index_shift "(sizeof(unsigned long)==8 ? 6 : 5)"
-    unsigned long offset_mask "(sizeof(unsigned long)==8 ? 0x3F : 0x1F)"
-    
-cdef struct bitset_s:
-    long size
-    long limbs
-    unsigned long *bits
-        
-ctypedef bitset_s bitset_t[1]
 
 #############################################################################
 # Bitset Initalization

(a) /dev/null vs. (b) b/sage/misc/bitset_pxd.pxi

@@ +1 @@
+#*****************************************************************************
+#     Copyright (C) 2008 Robert Bradshaw <robertwb@math.washington.edu>
+#
+#  Distributed under the terms of the GNU General Public License (GPL)
+#
+#    This code is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    General Public License for more details.
+#
+#  The full text of the GPL is available at:
+#
+#                  http://www.gnu.org/licenses/
+#*****************************************************************************
+
+
+
+# This is a .pxi file so that one can inline functions. Doctests in misc_c. 
+
+include "../ext/stdsage.pxi"
+
+cdef extern from *:
+    void *memset(void *, int, size_t)
+    void *memcpy(void *, void *, size_t)
+    int memcmp(void *, void *, size_t)
+    size_t strlen(char *)
+
+    # constant literals
+    int index_shift "(sizeof(unsigned long)==8 ? 6 : 5)"
+    unsigned long offset_mask "(sizeof(unsigned long)==8 ? 0x3F : 0x1F)"
+    
+cdef struct bitset_s:
+    long size
+    long limbs
+    unsigned long *bits
+        
+ctypedef bitset_s bitset_t[1]
+

sage/misc/misc_c.pyx

@@ -277 +277 @@
 # Bitset Testing
 #############################################################################
 
+include "bitset_pxd.pxi"
 include "bitset.pxi"
 
 def test_bitset(py_a, py_b, long n):