[deal.ii] 02/02: Use an explicit cast to fix FTBFS with new boost and c++11

[Graham Inggs]

This is an automated email from the git hooks/post-receive script.

ginggs pushed a commit to branch master
in repository deal.ii.

commit 3c826b356beb624dea09a19e594a66e748bcb558
Author: Graham Inggs <Graham Inggs ginggs at debian.org>
Date:   Wed Sep 16 18:53:54 2015 +0200

    Use an explicit cast to fix FTBFS with new boost and c++11
---
 debian/changelog                                 |  1 +
 debian/patches/fix_parameter_handler_cxx11.patch | 18 ++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4790506..b69ab53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 deal.ii (8.1.0-5) UNRELEASED; urgency=medium
 
   * Fix FTBFS due to doxygen deal.tag moving (Closes: #789975)
+  * Use an explicit cast to fix FTBFS with new boost and c++11
 
  -- Graham Inggs <ginggs at debian.org>  Wed, 16 Sep 2015 18:41:21 +0200
 
diff --git a/debian/patches/fix_parameter_handler_cxx11.patch b/debian/patches/fix_parameter_handler_cxx11.patch
new file mode 100644
index 0000000..cbaba75
--- /dev/null
+++ b/debian/patches/fix_parameter_handler_cxx11.patch
@@ -0,0 +1,18 @@
+Description: Use an explicit cast when need a bool from optional<...>
+ The implicit cast was previously allowed, but newer versions of BOOST
+ together with C++11 mark the cast as 'explicit',
+ and it fails in the current context.
+Origin: upstream, https://github.com/dealii/dealii/commit/57d975bc4c9c3d76bce59ee7462a6e94487c7e82#diff-68feb64779ad59c9cb61e300a1ab2917
+Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
+Last-Update: 2014-08-21
+--- a/source/base/parameter_handler.cc
++++ b/source/base/parameter_handler.cc
+@@ -1275,7 +1275,7 @@
+ bool
+ ParameterHandler::is_parameter_node (const boost::property_tree::ptree &p)
+ {
+-  return (p.get_optional<std::string>("value"));
++  return static_cast<bool>(p.get_optional<std::string>("value"));
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 75ebfb9..85e24d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix_suitesparse.patch
 use_local_deal_ico.patch
 fix_doxygen_deal.tag_moving.patch
+fix_parameter_handler_cxx11.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/deal.ii.git