[asl] 01/03: Add upstream patch fixing FTBFS with Boost 1.60.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository asl.

commit 80961bc0aae4eb3ffe7279efbab9f4ef4c7e728e
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sat May 7 19:17:45 2016 +0100

    Add upstream patch fixing FTBFS with Boost 1.60.
    
    Gbp-Dch: short
    Thanks: Gianfranco Costamagna
---
 ...define-namespace-of-ifstream-and-ofstream.patch | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 56 insertions(+)

diff --git a/debian/patches/Explicitly-define-namespace-of-ifstream-and-ofstream.patch b/debian/patches/Explicitly-define-namespace-of-ifstream-and-ofstream.patch
new file mode 100644
index 0000000..46aa148
--- /dev/null
+++ b/debian/patches/Explicitly-define-namespace-of-ifstream-and-ofstream.patch
@@ -0,0 +1,55 @@
+From: =?utf-8?q?Bart=C5=82omiej_Piotrowski?= <b at bpiotrowski.pl>
+Date: Mon, 21 Dec 2015 19:49:51 +0100
+Subject: Explicitly define namespace of ifstream and ofstream
+
+With GCC 5.3.0 and Boost 1.60.0, the build fails with following error:
+/build/libasl/src/ASL-0.1.6/src/utilities/aslParametersManager.cxx:466:6:
+error: reference to 'ifstream' is ambiguous
+      ifstream ifs(p.string());
+      ^
+/usr/include/boost/filesystem/fstream.hpp:169:32: note: candidates are:
+typedef class boost::filesystem::basic_ifstream<char> boost::filesystem::ifstream
+   typedef basic_ifstream<char> ifstream;
+                                ^
+---
+ src/utilities/aslParametersManager.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/utilities/aslParametersManager.cxx b/src/utilities/aslParametersManager.cxx
+index 98a0192..d6ef3c7 100644
+--- a/src/utilities/aslParametersManager.cxx
++++ b/src/utilities/aslParametersManager.cxx
+@@ -332,7 +332,7 @@ namespace asl
+ 
+ 		try
+ 		{
+-			ifstream ifs(paramFile);
++			std::ifstream ifs(paramFile);
+ 			if (!ifs.good())
+ 				errorMessage("Can not open parameters file: " + paramFile);
+ 
+@@ -357,7 +357,7 @@ namespace asl
+ 
+ 	void ParametersManager::writeParametersFile(const std::string fileName)
+ 	{
+-		ofstream fo(fileName);
++		std::ofstream fo(fileName);
+ 		if (!fo.good())
+ 			errorMessage("ParametersManager::writeParametersFile() - can not open file: " + fileName);
+ 
+@@ -463,7 +463,7 @@ namespace asl
+ 				}
+ 				else
+ 				{
+-					ifstream ifs(p.string());
++					std::ifstream ifs(p.string());
+ 					if (ifs.good())
+ 					{
+ 						parsed_options parsed = parse_config_file(ifs, allOptions, true);
+@@ -514,4 +514,4 @@ namespace asl
+ 		}
+ 	}
+ 		 
+-} //namespace asl
+\ No newline at end of file
++} //namespace asl
diff --git a/debian/patches/series b/debian/patches/series
index dd27442..d4aa1a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use-system-mathjax.patch
 Replace-includes-math.h-cmath.patch
+Explicitly-define-namespace-of-ifstream-and-ofstream.patch

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