Skip to content
Snippets Groups Projects
Commit 2c5baa0b authored by Markus Blatt's avatar Markus Blatt
Browse files

[Bugfix] Prevent definition of HAVE_BOOST without value due to race conditions...

[Bugfix] Prevent definition of HAVE_BOOST without value due to race conditions in some autoconf versions.

For some autoconf versions there was a race condition between ax_boost_base.m4 and dune_boost_base.m4 resulting in HAVE_BOOST being defined with no value (instead of ENABLE_BOOST). For others there were even two definitions of it (one with and one without value). 

This patch renames the symbol being defined in dune_boost_base.m4 to HAVE_DUNE_BOOST and defines a value for it if boost is found.

Please change your code such the preprocessor directives checking for boost from
#if HAVE_BOOST
to
#if HAVE_DUNE_BOOST

Resolves flyspray 1265 and presumably 1249.

[[Imported from SVN: r1895]]
parent 1424a2b3
No related branches found
No related tags found
No related merge requests found
......@@ -373,7 +373,7 @@ namespace Dune {
template<int I>
struct algmeta_itsteps {
#if HAVE_BOOST
#if HAVE_DUNE_BOOST
#ifdef HAVE_BOOST_FUSION
template<typename T11, typename T12, typename T13, typename T14,
......@@ -422,7 +422,7 @@ namespace Dune {
x.axpy(K(1)-w,xold);
}
#if HAVE_BOOST
#if HAVE_DUNE_BOOST
#ifdef HAVE_BOOST_FUSION
template<typename T11, typename T12, typename T13, typename T14,
......@@ -472,7 +472,7 @@ namespace Dune {
}
}
#if HAVE_BOOST
#if HAVE_DUNE_BOOST
#ifdef HAVE_BOOST_FUSION
template<typename T11, typename T12, typename T13, typename T14,
......@@ -522,7 +522,7 @@ namespace Dune {
}
}
#if HAVE_BOOST
#if HAVE_DUNE_BOOST
#ifdef HAVE_BOOST_FUSION
template<typename T11, typename T12, typename T13, typename T14,
......
......@@ -8,7 +8,7 @@
#include "istlexception.hh"
#if HAVE_BOOST
#if HAVE_DUNE_BOOST
#ifdef HAVE_BOOST_FUSION
#include <boost/fusion/sequence.hpp>
......@@ -463,5 +463,5 @@ namespace Dune {
} // end namespace
#endif // HAVE_BOOST_FUSION
#endif // HAVE_BOOST
#endif // HAVE_DUNE_BOOST
#endif
......@@ -3,7 +3,7 @@
#ifndef DUNE_MULTITYPEVECTOR_HH
#define DUNE_MULTITYPEVECTOR_HH
#if HAVE_BOOST
#if HAVE_DUNE_BOOST
#ifdef HAVE_BOOST_FUSION
#include <cmath>
......@@ -311,6 +311,6 @@ namespace Dune {
} // end namespace
#endif // end HAVE_BOOST_FUSION
#endif // end HAVE_BOOST
#endif // end HAVE_DUNE_BOOST
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment