[PPL-devel] [GIT] ppl/ppl(master): Prefer explicit tests against zero.

[Enea Zaffanella]

Module: ppl/ppl
Branch: master
Commit: 1228063d31da6c206e3b62f24419c0d0ddd77011
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1228063d31da6c206e3b62f24419c0d0ddd77011

Author: Enea Zaffanella <zaffanella at cs.unipr.it>
Date:   Sun Feb 26 10:10:20 2012 +0100

Prefer explicit tests against zero.
Detected by ECLAIR service utypflag.

---

 interfaces/C/ppl_c_implementation_common.cc |    4 ++--
 src/DB_Row.inlines.hh                       |    2 +-
 src/Interval_Info.inlines.hh                |    9 ++++-----
 src/ppl-config.cc.in                        |    4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc
index f5a6eac..b329a68 100644
--- a/interfaces/C/ppl_c_implementation_common.cc
+++ b/interfaces/C/ppl_c_implementation_common.cc
@@ -104,7 +104,7 @@ Weightwatch* p_deterministic_timeout_object = 0;
 
 void
 reset_timeout() {
-  if (p_timeout_object) {
+  if (p_timeout_object != 0) {
     delete p_timeout_object;
     p_timeout_object = 0;
     abandon_expensive_computations = 0;
@@ -113,7 +113,7 @@ reset_timeout() {
 
 void
 reset_deterministic_timeout() {
-  if (p_deterministic_timeout_object) {
+  if (p_deterministic_timeout_object != 0) {
     delete p_deterministic_timeout_object;
     p_deterministic_timeout_object = 0;
     abandon_expensive_computations = 0;
diff --git a/src/DB_Row.inlines.hh b/src/DB_Row.inlines.hh
index aa5cf4e..5522dad 100644
--- a/src/DB_Row.inlines.hh
+++ b/src/DB_Row.inlines.hh
@@ -257,7 +257,7 @@ template <typename T>
 inline
 DB_Row<T>::DB_Row(const DB_Row& y)
   : DB_Row_Impl_Handler<T>() {
-  if (y.impl) {
+  if (y.impl != 0) {
     allocate(compute_capacity(y.size(), max_size()));
     copy_construct_coefficients(y);
   }
diff --git a/src/Interval_Info.inlines.hh b/src/Interval_Info.inlines.hh
index 46f69f1..0aa03f6 100644
--- a/src/Interval_Info.inlines.hh
+++ b/src/Interval_Info.inlines.hh
@@ -86,12 +86,11 @@ template <typename T, typename Policy>
 inline bool
 Interval_Info_Bitset<T, Policy>::ascii_load(std::istream& s) {
   std::ios_base::fmtflags old = s.flags();
-  if (s >> std::hex >> bitset) {
-    s.flags(old);
-    return s;
-  }
-  else
+  s >> std::hex >> bitset;
+  if (!s)
     return false;
+  s.flags(old);
+  return s;
 }
 
 #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
diff --git a/src/ppl-config.cc.in b/src/ppl-config.cc.in
index 448f354..e54519d 100644
--- a/src/ppl-config.cc.in
+++ b/src/ppl-config.cc.in
@@ -339,7 +339,7 @@ struct option long_options[] = {
 
       // --prefix
     case 'p':
-      if (optarg) {
+      if (optarg != 0) {
 	prefix = optarg;
 	if (!exec_prefix_set) {
 	  exec_prefix = optarg;
@@ -354,7 +354,7 @@ struct option long_options[] = {
 
       // --exec_prefix
     case 'e':
-      if (optarg) {
+      if (optarg != 0) {
 	exec_prefix = optarg;
 	exec_prefix_set = true;
       }