[Dune] [Dune-Commit] dune-istl r1490 - trunk/dune/istl

[Christian Engwer]

Hi Rebecca,

your last patch is wrong. 
if you find boost HAVE_BOOST defined to ENABLE_BOOST, which 1 if you
pass the boost flags to the compiler.
if boost is missing HAVE_BOOST is either empty of 0, which is always
evaluated to false.

So you should keep it
#if HAVE_BOOST

Christian

On Tue, Aug 02, 2011 at 04:31:48PM +0200, rebecca at dune-project.org wrote:
> Author: rebecca
> Date: 2011-08-02 16:31:47 +0200 (Tue, 02 Aug 2011)
> New Revision: 1490
> 
> Modified:
>    trunk/dune/istl/gsetc.hh
>    trunk/dune/istl/multitypeblockmatrix.hh
>    trunk/dune/istl/multitypeblockvector.hh
> Log:
> change #if to #ifdef
> 
> Modified: trunk/dune/istl/gsetc.hh
> ===================================================================
> --- trunk/dune/istl/gsetc.hh	2011-07-12 14:06:28 UTC (rev 1489)
> +++ trunk/dune/istl/gsetc.hh	2011-08-02 14:31:47 UTC (rev 1490)
> @@ -373,7 +373,7 @@
>    template<int I>
>    struct algmeta_itsteps {
>  
> -#if HAVE_BOOST
> +#ifdef HAVE_BOOST
>  #ifdef HAVE_BOOST_FUSION
>  
>      template<typename T11, typename T12, typename T13, typename T14,
> @@ -421,7 +421,7 @@
>  	  x.axpy(1-w,xold);
>  	}
>  
> -#if HAVE_BOOST
> +#ifdef HAVE_BOOST
>  #ifdef HAVE_BOOST_FUSION
>  
>      template<typename T11, typename T12, typename T13, typename T14, 
> @@ -471,7 +471,7 @@
>  		}
>  	}
>  
> -#if HAVE_BOOST
> +#ifdef HAVE_BOOST
>  #ifdef HAVE_BOOST_FUSION
>  
>      template<typename T11, typename T12, typename T13, typename T14, 
> @@ -521,7 +521,7 @@
>  		}
>  	}
>  
> -#if HAVE_BOOST
> +#ifdef HAVE_BOOST
>  #ifdef HAVE_BOOST_FUSION
>  
>      template<typename T11, typename T12, typename T13, typename T14, 
> 
> Modified: trunk/dune/istl/multitypeblockmatrix.hh
> ===================================================================
> --- trunk/dune/istl/multitypeblockmatrix.hh	2011-07-12 14:06:28 UTC (rev 1489)
> +++ trunk/dune/istl/multitypeblockmatrix.hh	2011-08-02 14:31:47 UTC (rev 1490)
> @@ -6,7 +6,7 @@
>  
>  #include "istlexception.hh"
>  
> -#if HAVE_BOOST
> +#ifdef HAVE_BOOST
>  #ifdef HAVE_BOOST_FUSION
>  
>  #include <boost/fusion/sequence.hpp>
> 
> Modified: trunk/dune/istl/multitypeblockvector.hh
> ===================================================================
> --- trunk/dune/istl/multitypeblockvector.hh	2011-07-12 14:06:28 UTC (rev 1489)
> +++ trunk/dune/istl/multitypeblockvector.hh	2011-08-02 14:31:47 UTC (rev 1490)
> @@ -1,7 +1,7 @@
>  #ifndef DUNE_MULTITYPEVECTOR_HH
>  #define DUNE_MULTITYPEVECTOR_HH
>  
> -#if HAVE_BOOST
> +#ifdef HAVE_BOOST
>  #ifdef HAVE_BOOST_FUSION
>  
>  #include<cmath>
> 
> 
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit
>