From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Fri, 20 May 2011 13:43:23 +0000 (+0200)
Subject: Replace || by &&
X-Git-Tag: v1.3.0~350
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=431fea9a7c825943b07fc4b4f3423355a5fee501;p=clitk.git

Replace || by &&

- I commited my last patch a bit too fast.
---

diff --git a/common/clitkCommon.cxx b/common/clitkCommon.cxx
index 3c16d87..785b0fd 100644
--- a/common/clitkCommon.cxx
+++ b/common/clitkCommon.cxx
@@ -41,7 +41,7 @@ void clitk::skipComment(std::istream & is)
     is >> c;
     if (is.eof()) return;
   }
-  if (!(is.fail()) || c != '\n')
+  if (!(is.fail()) && c != '\n')
     is.unget();
 } ////
 //------------------------------------------------------------------