r44774 - in /packages/fenics/dolfin/trunk/debian/patches: ./ fix_swig_2.0.5_bug.patch gcc4.7.patch series
johannr-guest at users.alioth.debian.org
johannr-guest at users.alioth.debian.org
Mon May 14 10:50:43 UTC 2012
Author: johannr-guest
Date: Mon May 14 10:50:42 2012
New Revision: 44774
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44774
Log:
Add patch to fix issue with SWIG 2.0.5.
Add patch to fix FTBFS with GCC 4.7.
Added:
packages/fenics/dolfin/trunk/debian/patches/
packages/fenics/dolfin/trunk/debian/patches/fix_swig_2.0.5_bug.patch
packages/fenics/dolfin/trunk/debian/patches/gcc4.7.patch
packages/fenics/dolfin/trunk/debian/patches/series
Added: packages/fenics/dolfin/trunk/debian/patches/fix_swig_2.0.5_bug.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/fix_swig_2.0.5_bug.patch?rev=44774&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/fix_swig_2.0.5_bug.patch (added)
+++ packages/fenics/dolfin/trunk/debian/patches/fix_swig_2.0.5_bug.patch Mon May 14 10:50:42 2012
@@ -1,0 +1,266 @@
+diff -Nru dolfin-1.0.0.orig/ChangeLog dolfin-1.0.0/ChangeLog
+--- dolfin-1.0.0.orig/ChangeLog 2012-05-11 13:08:49.062853202 +0200
++++ dolfin-1.0.0/ChangeLog 2012-05-11 13:11:18.738851739 +0200
+@@ -1,3 +1,5 @@
++ - Fix bug introduced by SWIG 2.0.5, where typemaps of templated typedefs are not handled correctly
++ - Fix bug introduced by SWIG 2.0.5, which treated uint as Python long
+ 1.0.0 [2011-12-07]
+ - Recompile all forms with FFC 1.0.0
+ - Fix for CGAL 3.9 on OS X
+diff -Nru dolfin-1.0.0.orig/dolfin/swig/array_typemaps.i dolfin-1.0.0/dolfin/swig/array_typemaps.i
+--- dolfin-1.0.0.orig/dolfin/swig/array_typemaps.i 2012-05-11 13:08:49.074853207 +0200
++++ dolfin-1.0.0/dolfin/swig/array_typemaps.i 2012-05-11 13:10:27.666852240 +0200
+@@ -31,7 +31,7 @@
+ // SWIG use: INT32 for integer, DOUBLE for double aso.
+ // NUMPYTYPE : The NumPy type that is going to be checked for
+ // TYPE_NAME : The name of the pointer type, 'double' for 'double', 'uint' for
+-// 'dolfin::uint'
++// 'unsigned int'
+ // DESCR : The char descriptor of the NumPy type
+ // ARGNAME : The name of the argument the typemap will kick in for pass nothing
+ // and the typemap will kick in for all argument names
+@@ -40,7 +40,7 @@
+ //-----------------------------------------------------------------------------
+ %define IN_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(TYPE, TYPECHECK, NUMPYTYPE, TYPE_NAME, DESCR, ARGNAME, CONSTARRAY)
+
+-%typemap(in, fragment=convert_numpy_to_array_with_check(TYPE_NAME)) (CONSTARRAY dolfin::Array<TYPE> &ARGNAME) (dolfin::uint size, TYPE* data)
++%typemap(in, fragment=convert_numpy_to_array_with_check(TYPE_NAME)) (CONSTARRAY dolfin::Array<TYPE> &ARGNAME) (unsigned int size, TYPE* data)
+ {
+ if (!convert_numpy_to_array_with_check_ ## TYPE_NAME($input, size, data))
+ return NULL;
+@@ -104,15 +104,15 @@
+
+ // Instantiate argument name specific typemaps for non const arguments
+ IN_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(double, DOUBLE, NPY_DOUBLE, double, d, values, )
+-IN_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(dolfin::uint, INT32, NPY_UINT, uint, I, indices,)
++IN_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(unsigned int, INT32, NPY_UINT, uint, I, indices,)
+ IN_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(double, DOUBLE, NPY_DOUBLE, double, d, vertex_values, )
+
+ // Instantiate argument name independent typemaps for all
+ // const Array <{int, uint, double}>& arguments
+ IN_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(double, DOUBLE, NPY_DOUBLE, double, d, , const)
+-IN_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(dolfin::uint, INT32, NPY_UINT, uint, I, , const)
++IN_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(unsigned int, INT32, NPY_UINT, uint, I, , const)
+ IN_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(int, INT32, NPY_INT, int, i, , const)
+
+-OUT_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(dolfin::uint, NPY_UINT)
++OUT_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(unsigned int, NPY_UINT)
+ OUT_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(int, NPY_INT)
+ OUT_NUMPY_TYPEMAP_FOR_DOLFIN_ARRAY(double, NPY_DOUBLE)
+diff -Nru dolfin-1.0.0.orig/dolfin/swig/shared_ptr_classes.i dolfin-1.0.0/dolfin/swig/shared_ptr_classes.i
+--- dolfin-1.0.0.orig/dolfin/swig/shared_ptr_classes.i 2012-05-11 13:08:49.074853207 +0200
++++ dolfin-1.0.0/dolfin/swig/shared_ptr_classes.i 2012-05-11 13:10:27.670852240 +0200
+@@ -51,8 +51,14 @@
+ // Make DOLFIN aware of the types defined in UFC
+ //-----------------------------------------------------------------------------
+ // UFC
++%shared_ptr(ufc::cell_integral)
++%shared_ptr(ufc::dofmap)
++%shared_ptr(ufc::finite_element)
+ %shared_ptr(ufc::function)
+-%import "swig/ufc.i"
++%shared_ptr(ufc::form)
++%shared_ptr(ufc::exterior_facet_integral)
++%shared_ptr(ufc::interior_facet_integral)
++%import(module="ufc") "ufc.h"
+
+ //-----------------------------------------------------------------------------
+ // Declare shared_ptr stored types in PyDOLFIN
+diff -Nru dolfin-1.0.0.orig/dolfin/swig/std_map_typemaps.i dolfin-1.0.0/dolfin/swig/std_map_typemaps.i
+--- dolfin-1.0.0.orig/dolfin/swig/std_map_typemaps.i 2012-05-11 13:08:49.074853207 +0200
++++ dolfin-1.0.0/dolfin/swig/std_map_typemaps.i 2012-05-11 13:10:27.670852240 +0200
+@@ -124,5 +124,9 @@
+ //-----------------------------------------------------------------------------
+ // Run the macro and instantiate the typemaps
+ //-----------------------------------------------------------------------------
++// NOTE: SWIG BUG
++// NOTE: Because of bug introduced by SWIG 2.0.5 we cannot use templated versions
++// NOTE: of typdefs, which means we need to use unsigned int instead of dolfin::uint
++// NOTE: in typemaps
+ MAP_OUT_TYPEMAPS(unsigned int, unsigned int, uint)
+ MAP_OUT_TYPEMAPS(unsigned int, double, double)
+diff -Nru dolfin-1.0.0.orig/dolfin/swig/std_pair_typemaps.i dolfin-1.0.0/dolfin/swig/std_pair_typemaps.i
+--- dolfin-1.0.0.orig/dolfin/swig/std_pair_typemaps.i 2012-05-11 13:08:49.074853207 +0200
++++ dolfin-1.0.0/dolfin/swig/std_pair_typemaps.i 2012-05-11 13:10:27.670852240 +0200
+@@ -123,12 +123,12 @@
+ //-----------------------------------------------------------------------------
+ // In typemap for std::pair<TYPE,TYPE>
+ //-----------------------------------------------------------------------------
+-%typecheck(SWIG_TYPECHECK_POINTER) std::pair<dolfin::uint, dolfin::uint>
++%typecheck(SWIG_TYPECHECK_POINTER) std::pair<unsigned int, unsigned int>
+ {
+ $1 = PyTuple_Check($input) ? 1 : 0;
+ }
+
+-%typemap(in) std::pair<dolfin::uint, dolfin::uint> (std::pair<dolfin::uint, dolfin::uint> tmp_pair, long tmp)
++%typemap(in) std::pair<unsigned int, unsigned int> (std::pair<unsigned int, unsigned int> tmp_pair, long tmp)
+ {
+ // Check that we have a tuple
+ if (!PyTuple_Check($input) || PyTuple_Size($input) != 2)
+@@ -143,7 +143,7 @@
+ {
+ tmp = static_cast<long>(PyInt_AsLong(py_first));
+ if (tmp>=0)
+- tmp_pair.first = static_cast<dolfin::uint>(tmp);
++ tmp_pair.first = static_cast<unsigned int>(tmp);
+ else
+ SWIG_exception(SWIG_TypeError, "expected positive 'int' as the first tuple argument ");
+ }
+@@ -155,7 +155,7 @@
+ {
+ tmp = static_cast<long>(PyInt_AsLong(py_second));
+ if (tmp>=0)
+- tmp_pair.second = static_cast<dolfin::uint>(tmp);
++ tmp_pair.second = static_cast<unsigned int>(tmp);
+ else
+ SWIG_exception(SWIG_TypeError, "expected positive 'int' as the second tuple argument ");
+ }
+@@ -190,11 +190,11 @@
+ //-----------------------------------------------------------------------------
+ // Out typemap for std::pair<TYPE,TYPE>
+ //-----------------------------------------------------------------------------
+-%typemap(out) std::pair<dolfin::uint, dolfin::uint>
++%typemap(out) std::pair<unsigned int, unsigned int>
+ {
+ $result = Py_BuildValue("ii", $1.first, $1.second);
+ }
+-%typemap(out) std::pair<dolfin::uint, bool>
++%typemap(out) std::pair<unsigned int, bool>
+ {
+ $result = Py_BuildValue("ib", $1.first, $1.second);
+ }
+diff -Nru dolfin-1.0.0.orig/dolfin/swig/std_set_typemaps.i dolfin-1.0.0/dolfin/swig/std_set_typemaps.i
+--- dolfin-1.0.0.orig/dolfin/swig/std_set_typemaps.i 2012-05-11 13:08:49.074853207 +0200
++++ dolfin-1.0.0/dolfin/swig/std_set_typemaps.i 2012-05-11 13:10:27.670852240 +0200
+@@ -17,7 +17,7 @@
+ // along with DOLFIN. If not, see <http://www.gnu.org/licenses/>.
+ //
+ // First added: 2009-11-27
+-// Last changed: 2011-10-05
++// Last changed: 2012-05-09
+
+ //=============================================================================
+ // In this file we declare some typemaps for the std::set type
+@@ -72,5 +72,9 @@
+
+ %enddef
+
+-ARGOUT_TYPEMAP_BOOST_UNORDERED_SET_OF_PRIMITIVES(dolfin::uint, INT32, ids_result, NPY_INT)
+-ARGOUT_TYPEMAP_BOOST_UNORDERED_SET_OF_PRIMITIVES(dolfin::uint, INT32, cells, NPY_INT)
++// NOTE: SWIG BUG
++// NOTE: Because of bug introduced by SWIG 2.0.5 we cannot use templated versions
++// NOTE: of typdefs, which means we need to use unsigned int instead of dolfin::uint
++// NOTE: in typemaps
++ARGOUT_TYPEMAP_BOOST_UNORDERED_SET_OF_PRIMITIVES(unsigned int, INT32, ids_result, NPY_INT)
++ARGOUT_TYPEMAP_BOOST_UNORDERED_SET_OF_PRIMITIVES(unsigned int, INT32, cells, NPY_INT)
+diff -Nru dolfin-1.0.0.orig/dolfin/swig/std_vector_typemaps.i dolfin-1.0.0/dolfin/swig/std_vector_typemaps.i
+--- dolfin-1.0.0.orig/dolfin/swig/std_vector_typemaps.i 2012-05-11 13:08:49.074853207 +0200
++++ dolfin-1.0.0/dolfin/swig/std_vector_typemaps.i 2012-05-11 13:10:27.670852240 +0200
+@@ -17,7 +17,7 @@
+ // along with DOLFIN. If not, see <http://www.gnu.org/licenses/>.
+ //
+ // First added: 2009-08-31
+-// Last changed: 2011-10-09
++// Last changed: 2012-05-09
+
+ //=============================================================================
+ // In this file we declare what types that should be able to be passed using a
+@@ -454,21 +454,28 @@
+ //-----------------------------------------------------------------------------
+ // Run the different macros and instantiate the typemaps
+ //-----------------------------------------------------------------------------
++// NOTE: SWIG BUG
++// NOTE: Because of bug introduced by SWIG 2.0.5 we cannot use templated versions
++// NOTE: of typdefs, which means we need to use unsigned int instead of dolfin::uint
++// NOTE: in typemaps
+ TYPEMAPS_STD_VECTOR_OF_POINTERS(DirichletBC)
+ TYPEMAPS_STD_VECTOR_OF_POINTERS(BoundaryCondition)
+ TYPEMAPS_STD_VECTOR_OF_POINTERS(GenericFunction)
+ TYPEMAPS_STD_VECTOR_OF_POINTERS(FunctionSpace)
+ TYPEMAPS_STD_VECTOR_OF_POINTERS(Parameters)
+
+-ARGOUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(dolfin::uint, INT32, cells, NPY_INT)
+-ARGOUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(dolfin::uint, INT32, columns, NPY_INT)
++//ARGOUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(dolfin::uint, INT32, cells, NPY_INT)
++//ARGOUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(dolfin::uint, INT32, columns, NPY_INT)
++ARGOUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(unsigned int, INT32, cells, NPY_INT)
++ARGOUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(unsigned int, INT32, columns, NPY_INT)
+ ARGOUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(double, DOUBLE, values, NPY_DOUBLE)
+
+ IN_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(double, DOUBLE, values, NPY_DOUBLE, double, d)
+-IN_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(dolfin::uint, INT32, columns, NPY_UINT, uint, I)
++//IN_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(dolfin::uint, INT32, columns, NPY_UINT, uint, I)
++IN_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(unsigned int, INT32, columns, NPY_UINT, uint, I)
+
+-PY_SEQUENCE_OF_SCALARS_TO_VECTOR_OF_PRIMITIVES(dolfin::uint, INT32, coloring_type, uint, -1)
+-PY_SEQUENCE_OF_SCALARS_TO_VECTOR_OF_PRIMITIVES(dolfin::uint, INT32, value_shape, uint, -1)
++//PY_SEQUENCE_OF_SCALARS_TO_VECTOR_OF_PRIMITIVES(dolfin::uint, INT32, coloring_type, uint, -1)
++//PY_SEQUENCE_OF_SCALARS_TO_VECTOR_OF_PRIMITIVES(dolfin::uint, INT32, value_shape, uint, -1)
+ PY_SEQUENCE_OF_SCALARS_TO_VECTOR_OF_PRIMITIVES(unsigned int, INT32, coloring_type, uint, -1)
+ PY_SEQUENCE_OF_SCALARS_TO_VECTOR_OF_PRIMITIVES(unsigned int, INT32, value_shape, uint, -1)
+ PY_SEQUENCE_OF_SCALARS_TO_VECTOR_OF_PRIMITIVES(double, DOUBLE, values, double, -1)
+@@ -476,7 +483,7 @@
+ READONLY_OUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(double, double)
+ READONLY_OUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(int, int)
+ READONLY_OUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(unsigned int, uint)
+-READONLY_OUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(dolfin::uint, uint)
++//READONLY_OUT_TYPEMAP_STD_VECTOR_OF_PRIMITIVES(dolfin::uint, uint)
+
+ IN_TYPEMAP_STD_VECTOR_OF_SMALL_DOLFIN_TYPES(Point)
+ IN_TYPEMAP_STD_VECTOR_OF_SMALL_DOLFIN_TYPES(MeshEntity)
+diff -Nru dolfin-1.0.0.orig/dolfin/swig/typemaps.i dolfin-1.0.0/dolfin/swig/typemaps.i
+--- dolfin-1.0.0.orig/dolfin/swig/typemaps.i 2012-05-11 13:08:49.074853207 +0200
++++ dolfin-1.0.0/dolfin/swig/typemaps.i 2012-05-11 13:10:27.670852240 +0200
+@@ -65,24 +65,24 @@
+ {
+ if (!PyInteger_Check(in))
+ return false;
+- value = static_cast<dolfin::uint>(PyInt_AS_LONG(in));
++ value = static_cast<unsigned int>(PyInt_AS_LONG(in));
+ return true;
+ }
+ }
+
+ %fragment("Py_convert_uint", "header", fragment="PyInteger_Check") {
+ // A check for int and converter to uint
+- SWIGINTERNINLINE bool Py_convert_uint(PyObject* in, dolfin::uint& value)
++ SWIGINTERNINLINE bool Py_convert_uint(PyObject* in, unsigned int& value)
+ {
+ if (!(PyInteger_Check(in) && PyInt_AS_LONG(in)>=0))
+ return false;
+- value = static_cast<dolfin::uint>(PyInt_AS_LONG(in));
++ value = static_cast<unsigned int>(PyInt_AS_LONG(in));
+ return true;
+ }
+ }
+
+ //-----------------------------------------------------------------------------
+-// Typemaps for dolfin::uint and int
++// Typemaps for unsigned int and int
+ //-----------------------------------------------------------------------------
+
+ //-----------------------------------------------------------------------------
+@@ -91,7 +91,10 @@
+ %typemap(out, fragment=SWIG_From_frag(unsigned int)) unsigned int
+ {
+ // Typemap unsigned int
+- $result = SWIG_From(unsigned int)($1);
++ $result = PyInt_FromLong(static_cast< long >($1));
++ // NOTE: From SWIG 2.0.5 does this macro return a Python long,
++ // NOTE: which we do not want
++ //$result = SWIG_From(unsigned int)($1);
+ }
+
+ //-----------------------------------------------------------------------------
+diff -Nru dolfin-1.0.0.orig/test/unit/fem/python/Assembler.py dolfin-1.0.0/test/unit/fem/python/Assembler.py
+--- dolfin-1.0.0.orig/test/unit/fem/python/Assembler.py 2012-05-11 13:08:49.102853205 +0200
++++ dolfin-1.0.0/test/unit/fem/python/Assembler.py 2012-05-11 13:10:27.670852240 +0200
+@@ -375,7 +375,7 @@
+
+ # Create reference matrices and set entries
+ A0, M0 = uBLASDenseMatrix(4, 4), uBLASDenseMatrix(4, 4)
+- pos = numpy.array([0, 1, 2, 3], dtype='I')
++ pos = numpy.array([0, 1, 2, 3], dtype=numpy.uintc)
+ A0.set(numpy.array([[1.0/2.0, -1.0/6.0, -1.0/6.0, -1.0/6.0],
+ [-1.0/6.0, 1.0/6.0, 0.0, 0.0],
+ [-1.0/6.0, 0.0, 1.0/6.0, 0.0],
Added: packages/fenics/dolfin/trunk/debian/patches/gcc4.7.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/gcc4.7.patch?rev=44774&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/gcc4.7.patch (added)
+++ packages/fenics/dolfin/trunk/debian/patches/gcc4.7.patch Mon May 14 10:50:42 2012
@@ -1,0 +1,135 @@
+diff -Nru dolfin-1.0.0.orig/dolfin/intersection/Segment_3_Tetrahedron_3_intersection.h dolfin-1.0.0/dolfin/intersection/Segment_3_Tetrahedron_3_intersection.h
+--- dolfin-1.0.0.orig/dolfin/intersection/Segment_3_Tetrahedron_3_intersection.h 2012-05-14 11:18:34.735032778 +0200
++++ dolfin-1.0.0/dolfin/intersection/Segment_3_Tetrahedron_3_intersection.h 2012-05-14 11:19:08.599031581 +0200
+@@ -27,8 +27,6 @@
+
+ #include <dolfin/log/log.h>
+
+-using dolfin::error;
+-
+ CGAL_BEGIN_NAMESPACE
+
+ #if CGAL_VERSION_NR < 1030601000
+@@ -38,11 +36,9 @@
+ #endif
+
+ template <class K>
+- inline
+- bool
+- do_intersect(const typename K::Tetrahedron_3 &tet,
+- const typename K::Segment_3 &seg,
+- const K&)
++ bool do_intersect(const typename K::Tetrahedron_3& tet,
++ const typename K::Segment_3& seg,
++ const K&)
+ {
+ //throw exception!
+ dolfin_not_implemented();
+@@ -51,11 +47,9 @@
+ }
+
+ template <class K>
+- inline
+- bool
+- do_intersect(const typename K::Segment_3 &seg,
+- const typename K::Tetrahedron_3 &tet,
+- const K&)
++ bool do_intersect(const typename K::Segment_3& seg,
++ const typename K::Tetrahedron_3& tet,
++ const K&)
+ {
+ //throw exception!
+ dolfin_not_implemented();
+@@ -64,66 +58,58 @@
+ }
+
+ template <class K>
+- inline
+- Object
+- intersection(const typename K::Tetrahedron_3 &tet,
+- const typename K::Segment_3 &seg,
+- const K&)
++ Object intersection(const typename K::Tetrahedron_3& tet,
++ const typename K::Segment_3& seg,
++ const K&)
+ {
+ //throw exception!
+ dolfin_not_implemented();
+
+- if (do_intersect(tet,seg)) {
++ if (do_intersect(tet,seg))
+ return Object();
+- }
++
+ return Object();
+ }
+
+ template <class K>
+- inline
+- Object
+- intersection( const typename K::Segment_3 &seg,
+- const typename K::Tetrahedron_3 &tet,
+- const K&)
++ Object intersection(const typename K::Segment_3& seg,
++ const typename K::Tetrahedron_3& tet,
++ const K&)
+ {
+ //throw exception!
+ dolfin_not_implemented();
+
+- if (do_intersect(tet,seg)) {
++ if (do_intersect(tet,seg))
+ return Object();
+- }
++
+ return Object();
+ }
+
+ } // namespace CGALi
+
+ template <class K>
+- inline bool
+- do_intersect(const Segment_3<K> &seg, const Tetrahedron_3<K> &tet)
++ bool do_intersect(const Segment_3<K>& seg, const Tetrahedron_3<K>& tet)
+ {
+ typedef typename K::Do_intersect_3 Do_intersect;
+ return Do_intersect()(tet, seg);
+ }
+
+ template <class K>
+- inline bool
+- do_intersect(const Tetrahedron_3<K> &tet, const Segment_3<K> &seg)
++ bool do_intersect(const Tetrahedron_3<K>& tet, const Segment_3<K>& seg)
+ {
+ typedef typename K::Do_intersect_3 Do_intersect;
+ return Do_intersect()(tet, seg);
+ }
+
+ template <class K>
+- inline Object
+- intersection(const Segment_3<K> &seg, const Tetrahedron_3<K> &tet)
++ Object intersection(const Segment_3<K>& seg, const Tetrahedron_3<K>& tet)
+ {
+ typedef typename K::Intersect_3 Intersect;
+ return Intersect()(tet, seg);
+ }
+
+ template <class K>
+- inline Object
+- intersection(const Tetrahedron_3<K> &tet, const Segment_3<K> &seg)
++ Object intersection(const Tetrahedron_3<K>& tet, const Segment_3<K>& seg)
+ {
+ typedef typename K::Intersect_3 Intersect;
+ return Intersect()(tet, seg);
+diff -Nru dolfin-1.0.0.orig/dolfin/log/log.h dolfin-1.0.0/dolfin/log/log.h
+--- dolfin-1.0.0.orig/dolfin/log/log.h 2012-05-14 11:18:34.727032779 +0200
++++ dolfin-1.0.0/dolfin/log/log.h 2012-05-14 11:24:17.739020646 +0200
+@@ -151,7 +151,7 @@
+ // Not implemented error, reporting function name and line number
+ #define dolfin_not_implemented() \
+ do { \
+- dolfin_error("log.h", \
++ dolfin::dolfin_error("log.h", \
+ "perform call to DOLFIN function %s", \
+ "The function %s has not been implemented (in %s line %d)", \
+ __FUNCTION__, __FUNCTION__, __FILE__, __LINE__); \
Added: packages/fenics/dolfin/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/series?rev=44774&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/series (added)
+++ packages/fenics/dolfin/trunk/debian/patches/series Mon May 14 10:50:42 2012
@@ -1,0 +1,2 @@
+fix_swig_2.0.5_bug.patch
+gcc4.7.patch
More information about the debian-science-commits
mailing list