Changeset efa2e20 in git for Singular

Timestamp:

Feb 27, 2021, 8:42:00 PM (3 years ago)

Author:

Matthias Koeppe <mkoeppe@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

d198811bc9c027a4b6e2bfb58022b3e19fce2de2

Parents:

94f0b47f7be8fb597c626067fe68111ecfdd8618

Message:

Singular/dyn_modules/python/*.cc: Remove redundant conditionalization on HAVE_PYTHON_MOD

Location:

Singular/dyn_modules/python

Files:

• CF_wrap.cc (modified) (2 diffs)
• ideal_wrap.cc (modified) (2 diffs)
• interpreter_support.cc (modified) (2 diffs)
• intvec_wrap.cc (modified) (2 diffs)
• number_wrap.cc (modified) (2 diffs)
• playground.cc (modified) (2 diffs)
• poly_wrap.cc (modified) (2 diffs)
• python_module.cc (modified) (2 diffs)
• ring_wrap.cc (modified) (2 diffs)
• vector_wrap.cc (modified) (2 diffs)

Singular/dyn_modules/python/CF_wrap.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON_MOD
 #include <sstream>
 #include <boost/python.hpp>
@@ -47 +46 @@
     .def(self/=int());
 }
-#endif

Singular/dyn_modules/python/ideal_wrap.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON_MOD
 #include <boost/python.hpp>
 #include "Poly.h"
@@ -79 +78 @@
 
 }
-#endif

Singular/dyn_modules/python/interpreter_support.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON_MOD
 #include <sstream>
 #include <boost/python.hpp>
@@ -563 +562 @@
   def("is_builtin", is_builtin);
 }
-#endif

Singular/dyn_modules/python/intvec_wrap.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON_MOD
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
@@ -34 +33 @@
      .def(boost::python::vector_indexing_suite<Intvec>());
 }
-#endif
-

Singular/dyn_modules/python/number_wrap.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON_MOD
 #include <boost/python.hpp>
 #include "Number.h"
@@ -48 +47 @@
     .def("ring",Number_get_Ring);
 }
-#endif

Singular/dyn_modules/python/playground.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON_MOD
 #include <boost/python.hpp>
 #include "Poly.h"
@@ -54 +53 @@
   def("foo2",foo2);
 }
-#endif

Singular/dyn_modules/python/poly_wrap.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON_MOD
 #include <boost/python.hpp>
 #include "Poly.h"
@@ -60 +59 @@
 
 }
-#endif

Singular/dyn_modules/python/python_module.cc

@@ -17 +17 @@
 
 #include <time.h>
-#if defined(HAVE_PYTHON_MOD) && defined(HAVE_PYTHON)
 #include <boost/python.hpp>
 #include <Python.h>
@@ -85 +84 @@
   return MAX_TOK;
 }
-#endif

Singular/dyn_modules/python/ring_wrap.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON_MOD
 #include <boost/python.hpp>
 #include "Singular/ipshell.h"
@@ -37 +36 @@
      .def(boost::python::init <>());
 }
-#endif

Singular/dyn_modules/python/vector_wrap.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON_MOD
 #include <boost/python.hpp>
 #include "Poly.h"
@@ -34 +33 @@
     .def("ring",Vector_get_Ring);
 }
-#endif