Bug#588204: [boost1.42] conflict between boost::fusion and boost::mpl

[Christophe Prud'homme]

Package: boost1.42
Version: 1.42.0-3 
Severity: important
Tags: patch

--- Please enter the report below this line. ---
There is a conflict between data structures and functions from boost::fusion 
and boost::mpl that causes massive error messages at compilation for 
fusion::map containers and associated deref. In order to fix that I prepend 
the boost::fusion namespace. Patch attached. This has been tested and works 
properly.

--- System information. ---
Architecture: amd64
Kernel:       Linux 2.6.32-trunk-amd64

Debian Release: squeeze/sid
  500 unstable        ftp.fr.debian.org 
  500 stable          dl.google.com 
    1 experimental    ftp.fr.debian.org 

--- Package information. ---
Package's Depends field is empty.

Package's Recommends field is empty.

Package's Suggests field is empty.




-- 
Christophe Prud'homme
Université de Grenoble      christophe.prudho...@ujf-grenoble.fr
LJK - Room 55                  Tel: +33476635497
51, rue des Mathématiques      Fax: +33476631263
BP53 38041 Grenoble Cedex 9   
      <http://ljk.imag.fr/membres/Christophe.Prudhomme/>      

-- 
Debian Developer
Annecy - Grenoble
Scientific computing related software

Index: boost1.42-1.42.0/boost/fusion/container/map/detail/deref_data_impl.hpp
===================================================================
--- boost1.42-1.42.0.orig/boost/fusion/container/map/detail/deref_data_impl.hpp	2010-07-06 07:34:34.000000000 +0200
+++ boost1.42-1.42.0/boost/fusion/container/map/detail/deref_data_impl.hpp	2010-07-06 07:34:53.000000000 +0200
@@ -39,7 +39,7 @@
             static type
             call(It const& it)
             {
-                return deref(it).second;
+	         return boost::fusion::deref(it).second;
             }
         };
     };
Index: boost1.42-1.42.0/boost/fusion/container/map/detail/deref_impl.hpp
===================================================================
--- boost1.42-1.42.0.orig/boost/fusion/container/map/detail/deref_impl.hpp	2010-07-06 07:35:00.000000000 +0200
+++ boost1.42-1.42.0/boost/fusion/container/map/detail/deref_impl.hpp	2010-07-06 07:35:12.000000000 +0200
@@ -36,7 +36,7 @@
             static type
             call(It const& it)
             {
-                return at<typename It::index>(it.seq->get_data());
+	         return boost::fusion::at<typename It::index>(it.seq->get_data());
             }
         };
     };