| 1 |
commit: 44d3a3571a8dde665488d26c1057a87b9c62af9e |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 22 18:56:25 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 24 12:44:14 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d3a357 |
| 7 |
|
| 8 |
sci-biology/iqpnni: Fix CRLF line endings in patch |
| 9 |
|
| 10 |
Gentoo-bug: 594654 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.1 |
| 13 |
|
| 14 |
sci-biology/iqpnni/files/iqpnni-3.3.2-cpp14.patch | 48 +++++++++++------------ |
| 15 |
1 file changed, 24 insertions(+), 24 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-biology/iqpnni/files/iqpnni-3.3.2-cpp14.patch b/sci-biology/iqpnni/files/iqpnni-3.3.2-cpp14.patch |
| 18 |
index 1249516..69a4aac 100644 |
| 19 |
--- a/sci-biology/iqpnni/files/iqpnni-3.3.2-cpp14.patch |
| 20 |
+++ b/sci-biology/iqpnni/files/iqpnni-3.3.2-cpp14.patch |
| 21 |
@@ -16,33 +16,33 @@ Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=594332 |
| 22 |
--- a/src/iqp.cpp |
| 23 |
+++ b/src/iqp.cpp |
| 24 |
@@ -508,7 +508,7 @@ |
| 25 |
- if (in_pam.tree_file != NULL) { |
| 26 |
- std::ifstream userTreeFile_; |
| 27 |
- userTreeFile_.open (in_pam.tree_file); |
| 28 |
-- if (userTreeFile_ != 0) { |
| 29 |
-+ if (userTreeFile_) { |
| 30 |
- initialTree_.readFile (in_pam.tree_file); |
| 31 |
- initialTree_.createUrTree (); |
| 32 |
- hasInitTree = true; |
| 33 |
+ if (in_pam.tree_file != NULL) { |
| 34 |
+ std::ifstream userTreeFile_; |
| 35 |
+ userTreeFile_.open (in_pam.tree_file); |
| 36 |
+- if (userTreeFile_ != 0) { |
| 37 |
++ if (userTreeFile_) { |
| 38 |
+ initialTree_.readFile (in_pam.tree_file); |
| 39 |
+ initialTree_.createUrTree (); |
| 40 |
+ hasInitTree = true; |
| 41 |
--- a/src/main.cpp |
| 42 |
+++ b/src/main.cpp |
| 43 |
@@ -118,7 +118,7 @@ |
| 44 |
- |
| 45 |
- ifstream in; |
| 46 |
- in.open (boottree_file_name.c_str()); |
| 47 |
-- if (in == 0) |
| 48 |
-+ if (!in) |
| 49 |
- Utl::announceError ("Cannot open the user tree file ..."); |
| 50 |
- |
| 51 |
- int num_tree = 0; |
| 52 |
+ |
| 53 |
+ ifstream in; |
| 54 |
+ in.open (boottree_file_name.c_str()); |
| 55 |
+- if (in == 0) |
| 56 |
++ if (!in) |
| 57 |
+ Utl::announceError ("Cannot open the user tree file ..."); |
| 58 |
+ |
| 59 |
+ int num_tree = 0; |
| 60 |
--- a/src/usertree.cpp |
| 61 |
+++ b/src/usertree.cpp |
| 62 |
@@ -94,7 +94,7 @@ |
| 63 |
- void UserTree::readFile (const char *userTreeFile) { |
| 64 |
- ifstream in; |
| 65 |
- in.open (userTreeFile); |
| 66 |
-- if (in == 0) |
| 67 |
-+ if (!in) |
| 68 |
- Utl::announceError ("Cannot open the user tree file ..."); |
| 69 |
- |
| 70 |
- readFile(in); |
| 71 |
+ void UserTree::readFile (const char *userTreeFile) { |
| 72 |
+ ifstream in; |
| 73 |
+ in.open (userTreeFile); |
| 74 |
+- if (in == 0) |
| 75 |
++ if (!in) |
| 76 |
+ Utl::announceError ("Cannot open the user tree file ..."); |
| 77 |
+ |
| 78 |
+ readFile(in); |
Archives