[SCM] Packaging for dune-grid: a toolbox for solving PDEs -- grid interface branch, master, updated. debian/2.2.svn8198-1

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit fd062ec052fd878cc5bbc4b160b0ef665f421f06
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sun Jun 3 12:24:11 2012 +0200

    Apply upstream patch for FS #1120 (r8204).

diff --git a/debian/patches/geometrygrid-allocator-r8204.patch b/debian/patches/geometrygrid-allocator-r8204.patch
new file mode 100644
index 0000000..354198b
--- /dev/null
+++ b/debian/patches/geometrygrid-allocator-r8204.patch
@@ -0,0 +1,38 @@
+From af4994fb94c19051f6fa90ba57e33a084b283d41 Mon Sep 17 00:00:00 2001
+From: christi <christi at f82f27de-4411-0410-b156-930a902cda50>
+Date: Sat, 2 Jun 2012 15:09:22 +0000
+Subject: [PATCH] [geometrygrid] change default allocator type from
+ std::allocator<void> to std::allocator<char> shouldn't
+ change anything, as the actual allocator is obtained via
+ rebind.
+
+Fixes FS#1120
+
+git-svn-id: https://svn.dune-project.org/svn/dune-grid/trunk@8204 f82f27de-4411-0410-b156-930a902cda50
+---
+ dune/grid/geometrygrid/cachedcoordfunction.hh |    2 +-
+ dune/grid/geometrygrid/grid.hh                |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/dune/grid/geometrygrid/cachedcoordfunction.hh
++++ b/dune/grid/geometrygrid/cachedcoordfunction.hh
+@@ -88,7 +88,7 @@
+   // CachedCoordFunction
+   // -------------------
+ 
+-  template< class HostGrid, class CoordFunction, class Allocator = std::allocator< void > >
++  template< class HostGrid, class CoordFunction, class Allocator = std::allocator< char > >
+   class CachedCoordFunction
+   : public DiscreteCoordFunction< typename CoordFunction::ctype, CoordFunction::dimRange, CachedCoordFunction< HostGrid, CoordFunction > >
+   {
+--- a/dune/grid/geometrygrid/grid.hh
++++ b/dune/grid/geometrygrid/grid.hh
+@@ -69,7 +69,7 @@
+    *
+    *  \nosubgrouping
+    */
+-  template< class HostGrid, class CoordFunction = DefaultCoordFunction< HostGrid >, class Allocator = std::allocator< void > >
++  template< class HostGrid, class CoordFunction = DefaultCoordFunction< HostGrid >, class Allocator = std::allocator< char > >
+   class GeometryGrid
+   /** \cond */
+   : public GridDefaultImplementation
diff --git a/debian/patches/series b/debian/patches/series
index 8ddb676..eb06dfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ disable-alberta3d-test.patch
 install-grids-as-doc.patch
 do-not-install-amiramesh-grids.patch
 refinement-test-failure-r8201.patch
+geometrygrid-allocator-r8204.patch

-- 
Packaging for dune-grid: a toolbox for solving PDEs -- grid interface