From: David Seifert <soap@gentoo.org>
Date: Thu, 22 Sep 2016 18:56:25 +0000 (+0200)
Subject: sci-biology/iqpnni: Fix CRLF line endings in patch
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=44d3a3571a8dde665488d26c1057a87b9c62af9e;p=gentoo.git

sci-biology/iqpnni: Fix CRLF line endings in patch

Gentoo-bug: 594654

Package-Manager: portage-2.3.1
---

diff --git a/sci-biology/iqpnni/files/iqpnni-3.3.2-cpp14.patch b/sci-biology/iqpnni/files/iqpnni-3.3.2-cpp14.patch
index 12495167c7ad..69a4aacb61b1 100644
--- a/sci-biology/iqpnni/files/iqpnni-3.3.2-cpp14.patch
+++ b/sci-biology/iqpnni/files/iqpnni-3.3.2-cpp14.patch
@@ -16,33 +16,33 @@ Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=594332
 --- a/src/iqp.cpp
 +++ b/src/iqp.cpp
 @@ -508,7 +508,7 @@
- 		if (in_pam.tree_file != NULL) {
- 			std::ifstream userTreeFile_;
- 			userTreeFile_.open (in_pam.tree_file);
--			if (userTreeFile_ != 0) {
-+			if (userTreeFile_) {
- 				initialTree_.readFile (in_pam.tree_file);
- 				initialTree_.createUrTree ();
- 				hasInitTree = true;
+ 		if (in_pam.tree_file != NULL) {
+ 			std::ifstream userTreeFile_;
+ 			userTreeFile_.open (in_pam.tree_file);
+-			if (userTreeFile_ != 0) {
++			if (userTreeFile_) {
+ 				initialTree_.readFile (in_pam.tree_file);
+ 				initialTree_.createUrTree ();
+ 				hasInitTree = true;
 --- a/src/main.cpp
 +++ b/src/main.cpp
 @@ -118,7 +118,7 @@
- 
- 	ifstream in;
- 	in.open (boottree_file_name.c_str());
--	if (in == 0)
-+	if (!in)
- 		Utl::announceError ("Cannot open the user tree file ...");
- 
- 	int num_tree = 0;
+ 
+ 	ifstream in;
+ 	in.open (boottree_file_name.c_str());
+-	if (in == 0)
++	if (!in)
+ 		Utl::announceError ("Cannot open the user tree file ...");
+ 
+ 	int num_tree = 0;
 --- a/src/usertree.cpp
 +++ b/src/usertree.cpp
 @@ -94,7 +94,7 @@
- void UserTree::readFile (const char *userTreeFile) {
- 	ifstream in;
- 	in.open (userTreeFile);
--	if (in == 0)
-+	if (!in)
- 		Utl::announceError ("Cannot open the user tree file ...");
- 
- 	readFile(in);
+ void UserTree::readFile (const char *userTreeFile) {
+ 	ifstream in;
+ 	in.open (userTreeFile);
+-	if (in == 0)
++	if (!in)
+ 		Utl::announceError ("Cannot open the user tree file ...");
+ 
+ 	readFile(in);