sci-biology/iqpnni: Fix CRLF line endings in patch
authorDavid Seifert <soap@gentoo.org>
Thu, 22 Sep 2016 18:56:25 +0000 (20:56 +0200)
committerDavid Seifert <soap@gentoo.org>
Sat, 24 Sep 2016 12:44:14 +0000 (14:44 +0200)
Gentoo-bug: 594654

Package-Manager: portage-2.3.1

sci-biology/iqpnni/files/iqpnni-3.3.2-cpp14.patch

index 12495167c7add01e688003c833b92de3eaa40104..69a4aacb61b152b6d9d6f061f7a1e0c51954b4fa 100644 (file)
@@ -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) {\r
+                       std::ifstream userTreeFile_;\r
+                       userTreeFile_.open (in_pam.tree_file);\r
+-                      if (userTreeFile_ != 0) {\r
++                      if (userTreeFile_) {\r
+                               initialTree_.readFile (in_pam.tree_file);\r
+                               initialTree_.createUrTree ();\r
+                               hasInitTree = true;\r
 --- 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;
+ \r
+       ifstream in;\r
+       in.open (boottree_file_name.c_str());\r
+-      if (in == 0)\r
++      if (!in)\r
+               Utl::announceError ("Cannot open the user tree file ...");\r
+ \r
+       int num_tree = 0;\r
 --- 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) {\r
+       ifstream in;\r
+       in.open (userTreeFile);\r
+-      if (in == 0)\r
++      if (!in)\r
+               Utl::announceError ("Cannot open the user tree file ...");\r
+ \r
+       readFile(in);\r