Fix warnings in src and test (bool cast)

zhi-wang · zhi-wang · commit 382fcbc63a4f · 2022-06-16T04:55:11.000-05:00
diff --git a/include/ff/atom.h b/include/ff/atom.h
@@ -29,7 +29,7 @@ void copyPosToXyz(bool refreshNBList);
 ///    - Tinker uses centers of mass.
 void bounds();
 
-void readFrameCopyinToXyz(std::istream& input, int& done);
+void readFrameCopyinToXyz(std::istream& input, bool& done);
 
 //====================================================================//
 //                                                                    //
diff --git a/include/tool/argkey.h b/include/tool/argkey.h
@@ -4,10 +4,10 @@
 #include <vector>
 
 namespace tinker {
-void nextarg(size_t len, char* str, int& exist);
+void nextarg(size_t len, char* str, bool& exist);
 
 template <size_t Len>
-void nextarg(char (&str)[Len], int& exist)
+void nextarg(char (&str)[Len], bool& exist)
 {
    nextarg(Len, str, exist);
 }
diff --git a/src/argkey.cpp b/src/argkey.cpp
@@ -4,7 +4,7 @@
 #include <tinker/detail/keys.hh>
 
 namespace tinker {
-void nextarg(size_t len, char* str, int& exist)
+void nextarg(size_t len, char* str, bool& exist)
 {
    const char blank = ' ';
    std::memset(str, blank, len);
@@ -14,7 +14,7 @@ void nextarg(size_t len, char* str, int& exist)
       size_t length = std::min(len, sizeof(argue::arg[argue::maxarg]));
       for (int i = 1; i <= argue::narg; ++i) {
          if (argue::listarg[i]) {
-            argue::listarg[i] = false;
+            argue::listarg[i] = 0;
             std::strncpy(str, argue::arg[i], length);
             exist = true;
             break;
diff --git a/src/atom.cpp b/src/atom.cpp
@@ -154,7 +154,7 @@ void bounds()
    copyPosToXyz();
 }
 
-void readFrameCopyinToXyz(std::istream& ipt, int& done)
+void readFrameCopyinToXyz(std::istream& ipt, bool& done)
 {
    if (done)
       return;
diff --git a/src/echarge.cpp b/src/echarge.cpp
@@ -17,7 +17,7 @@ void echargeData(RcOp op)
    if (not use(Potent::CHARGE))
       return;
 
-   bool rc_a = rc_flag & calc::analyz;
+   auto rc_a = rc_flag & calc::analyz;
 
    if (op & RcOp::DEALLOC) {
       ncexclude = 0;
@@ -173,11 +173,11 @@ void echargeEwaldRecipSelf(int vers)
 TINKER_FVOID2(acc1, cu1, echargeEwaldReal, int);
 void echarge(int vers)
 {
-   bool rc_a = rc_flag & calc::analyz;
-   bool do_a = vers & calc::analyz;
-   bool do_e = vers & calc::energy;
-   bool do_v = vers & calc::virial;
-   bool do_g = vers & calc::grad;
+   auto rc_a = rc_flag & calc::analyz;
+   auto do_a = vers & calc::analyz;
+   auto do_e = vers & calc::energy;
+   auto do_v = vers & calc::virial;
+   auto do_g = vers & calc::grad;
 
    zeroOnHost(energy_ec, virial_ec);
    size_t bsize = bufferSize();
@@ -195,7 +195,7 @@ void echarge(int vers)
    if (useEwald()) {
       echargeEwaldRecipSelf(vers);
       TINKER_FCALL2(acc1, cu1, echargeEwaldReal, vers);
-      pmeStreamFinishWait(use_pme_stream and (vers & calc::analyz));
+      pmeStreamFinishWait(use_pme_stream and static_cast<bool>(vers & calc::analyz));
    } else
       echargeNonEwald(vers);
 
diff --git a/src/echglj.cpp b/src/echglj.cpp
@@ -273,8 +273,8 @@ TINKER_FVOID2(acc0, cu1, echgljRadArithEpsGeomNonEwald, int);
 TINKER_FVOID2(acc0, cu1, echgljRadArithEpsGeomEwaldReal, int);
 void echglj(int vers)
 {
-   bool do_e = vers & calc::energy;
-   bool do_v = vers & calc::virial;
+   auto do_e = vers & calc::energy;
+   auto do_v = vers & calc::virial;
 
    zeroOnHost(energy_ec, virial_ec);
    zeroOnHost(energy_ev, virial_ev);
diff --git a/src/elec.cpp b/src/elec.cpp
@@ -794,7 +794,7 @@ static void chgpenData(RcOp op)
 namespace tinker {
 bool useEwald()
 {
-   bool flag = useEnergyElec() and limits::use_ewald;
+   bool flag = useEnergyElec() and static_cast<bool>(limits::use_ewald);
    return flag;
 }
 
diff --git a/src/energy.cpp b/src/energy.cpp
@@ -46,7 +46,7 @@ static bool fts(std::string eng, bool& use_flag, unsigned tsflag, const TimeScal
    auto local_flag = tsflag;
    const auto& local_cfg = tsconfig;
    try {
-      bool f = local_flag & (1 << local_cfg.at(eng));
+      bool f = static_cast<bool>(local_flag & (1 << local_cfg.at(eng)));
       use_flag = use_flag or f;
       return f;
    } catch (const std::out_of_range&) {
@@ -267,7 +267,7 @@ void energy_core(int vers, unsigned tsflag, const TimeScaleConfig& tsconfig)
       if (tscfg("erepel", ecore_vdw))
          erepel(vers);
 
-   pmeStreamFinishWait(use_pme_stream and not(vers & calc::analyz));
+   pmeStreamFinishWait(use_pme_stream and not static_cast<bool>(vers & calc::analyz));
 
 #undef tscfg
 }
@@ -300,10 +300,10 @@ void energy(int vers, unsigned tsflag, const TimeScaleConfig& tsconfig)
    zeroEGV(vers);
    energy_core(vers, tsflag, tsconfig);
 
-   bool rc_a = rc_flag & calc::analyz;
-   bool do_e = vers & calc::energy;
-   bool do_v = vers & calc::virial;
-   bool do_g = vers & calc::grad;
+   auto rc_a = rc_flag & calc::analyz;
+   auto do_e = vers & calc::energy;
+   auto do_v = vers & calc::virial;
+   auto do_g = vers & calc::grad;
 
    bool must_wait = false;
    ev_hobj.e_val = 0;
@@ -498,7 +498,7 @@ bool useEnergyElec()
 namespace tinker {
 void egvData(RcOp op)
 {
-   bool rc_a = rc_flag & calc::analyz;
+   auto rc_a = rc_flag & calc::analyz;
 
    if (op & RcOp::DEALLOC) {
       deviceMemoryDeallocate(ev_dptr);
diff --git a/src/evdw.cpp b/src/evdw.cpp
@@ -31,7 +31,7 @@ void evdwData(RcOp op)
    if (not use(Potent::VDW))
       return;
 
-   bool rc_a = rc_flag & calc::analyz;
+   auto rc_a = rc_flag & calc::analyz;
 
    if (op & RcOp::DEALLOC) {
       // local static variables
@@ -406,11 +406,11 @@ void evdwData(RcOp op)
 
 void evdw(int vers)
 {
-   bool rc_a = rc_flag & calc::analyz;
-   bool do_a = vers & calc::analyz;
-   bool do_e = vers & calc::energy;
-   bool do_v = vers & calc::virial;
-   bool do_g = vers & calc::grad;
+   auto rc_a = rc_flag & calc::analyz;
+   auto do_a = vers & calc::analyz;
+   auto do_e = vers & calc::energy;
+   auto do_v = vers & calc::virial;
+   auto do_g = vers & calc::grad;
 
    zeroOnHost(energy_ev, virial_ev);
    size_t bsize = bufferSize();
diff --git a/src/initial.cpp b/src/initial.cpp
@@ -83,49 +83,49 @@ void initial()
    planb = 0;
 
    using namespace inform;
-   silent = false;
-   verbose = false;
-   debug = false;
-   abort = false;
+   silent = 0;
+   verbose = 0;
+   debug = 0;
+   abort = 0;
 
    using namespace group;
-   use_group = false;
+   use_group = 0;
 
    using namespace bound;
-   use_bounds = false;
-   use_replica = false;
-   use_polymer = false;
+   use_bounds = 0;
+   use_replica = 0;
+   use_polymer = 0;
 
    using namespace neigh;
-   dovlst = true;
-   dodlst = true;
-   doclst = true;
-   domlst = true;
-   doulst = true;
+   dovlst = 1;
+   dodlst = 1;
+   doclst = 1;
+   domlst = 1;
+   doulst = 1;
 
    using namespace bath;
-   isothermal = false;
-   isobaric = false;
+   isothermal = 0;
+   isobaric = 0;
 
    using namespace virial;
-   use_virial = true;
+   use_virial = 1;
 
    using namespace rigid;
-   use_rigid = false;
+   use_rigid = 0;
 
    using namespace scales;
-   set_scale = false;
+   set_scale = 0;
 
    using namespace socket;
-   sktstart = false;
-   use_socket = false;
+   sktstart = 0;
+   use_socket = 0;
 
    using namespace warp;
-   use_smooth = false;
-   use_dem = false;
-   use_gda = false;
-   use_tophat = false;
-   use_stophat = false;
+   use_smooth = 0;
+   use_dem = 0;
+   use_gda = 0;
+   use_tophat = 0;
+   use_stophat = 0;
 
    FstrView coordtype = output::coordtype;
    coordtype = "NONE";
diff --git a/src/iofortstr.cpp b/src/iofortstr.cpp
@@ -28,7 +28,7 @@ bool FortranStringView::ifEq(const char* src, size_t len) const
    } else {
       copyWithBlank(&buffer[0], lc, src, len);
    }
-   return !std::strncmp(ptr, buffer.c_str(), lc);
+   return 0 == std::strncmp(ptr, buffer.c_str(), lc);
 }
 
 size_t FortranStringView::size() const
diff --git a/src/iotext.cpp b/src/iotext.cpp
@@ -16,7 +16,7 @@ void Text::replace(std::string& src, std::string old, char r)
    std::bitset<256> alphabets;
    for (char ic : old) {
       unsigned char c = ic;
-      alphabets[c] = 1;
+      alphabets[c] = true;
    }
    for (char& rc : src) {
       unsigned char c = rc;
diff --git a/src/mdsave.cpp b/src/mdsave.cpp
@@ -30,7 +30,7 @@ static std::future<void> fut_dup_then_write;
 
 static bool mdsaveUseUind()
 {
-   return output::uindsave && use(Potent::POLAR);
+   return static_cast<bool>(output::uindsave) and use(Potent::POLAR);
 }
 
 static ExecQ dup_stream;
diff --git a/src/potent.cpp b/src/potent.cpp
@@ -19,7 +19,7 @@
 namespace tinker {
 bool use(Potent term)
 {
-   bool val = false;
+   int val = 0;
    switch (term) {
 
       // bonded terms
@@ -103,7 +103,7 @@ bool use(Potent term)
       assert(false);
       break;
    }
-   return val;
+   return static_cast<bool>(val);
 }
 
 int countBondedTerm(Potent term)
diff --git a/src/rattle.cpp b/src/rattle.cpp
@@ -175,7 +175,7 @@ static std::map<int, size_t> hc_dict;
 namespace tinker {
 bool useRattle()
 {
-   return freeze::use_rattle;
+   return static_cast<bool>(freeze::use_rattle);
 }
 
 void rattleData(RcOp op)
diff --git a/src/xanalyze.cpp b/src/xanalyze.cpp
@@ -423,7 +423,7 @@ void xAnalyze(int, char**)
    mechanic2();
 
    char string[240];
-   int exist = false;
+   bool exist = false;
    std::string opt;
    nextarg(string, exist);
    if (exist) {
@@ -457,7 +457,7 @@ void xAnalyze(int, char**)
    FstrView fsw = files::filename;
    std::string fname = fsw.trim();
    std::ifstream ipt(fname);
-   int done = false;
+   bool done = false;
    int nframe_processed = 0;
    do {
       readFrameCopyinToXyz(ipt, done);
diff --git a/src/xbar.cpp b/src/xbar.cpp
@@ -59,7 +59,7 @@ static void xBarMake()
       std::memcpy(keys0[i].data(), keys::keyline[i], MAX_NCHAR);
 
    // find the original temperature value for trajectory A
-   int exist = false;
+   bool exist = false;
    tempa = -1;
    nextarg(string, exist);
    if (exist)
@@ -73,7 +73,7 @@ static void xBarMake()
    tinker_f_getarc(&iarc);
    tinker_f_close(&iarc);
    tinker_f_mechanic();
-   inform::silent = true;
+   inform::silent = 1;
 
    // store the filename for trajectory B
    std::memcpy(fileb, files::filename, MAX_NCHAR);
@@ -98,7 +98,7 @@ static void xBarMake()
       298.0, invalid_temperature);
 
    // decide whether to use energies from trajectory log files
-   int recompute = true;
+   bool recompute = true;
    char answer = ' ';
    nextarg(string, exist);
    if (exist)
@@ -112,7 +112,7 @@ static void xBarMake()
 
    //====================================================================//
 
-   int done;
+   bool done;
    const char* log_fmt = " Current Potential %lf\n";
    const char* process_fmt = "       Completed%8d Coordinate Frames\n";
    std::memcpy(string, filea, lenga);
@@ -352,8 +352,8 @@ static void xBarMake()
 static void xBarCalc()
 {
    auto out = stdout;
-   int exist = false;
-   int query;
+   bool exist = false;
+   bool query;
    char string[MAX_NCHAR];
    std::string str;
    auto invalid_barfile = [&](const std::string& s) {
@@ -876,7 +876,7 @@ void xBar(int, char**)
 
    char string[MAX_NCHAR];
    auto out = stdout;
-   int exist;
+   bool exist;
    int mode = 0;
    auto invalid_mode = [](int m) { return m != 1 and m != 2; };
    const char* mode_string1 = R"(
diff --git a/src/xdynamic.cpp b/src/xdynamic.cpp
diff --git a/src/xminimize.cpp b/src/xminimize.cpp
diff --git a/test/bounds.cpp b/test/bounds.cpp
diff --git a/test/testrt.cpp b/test/testrt.cpp

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`	`#include <vector>`
`5`	`5`
`6`	`6`	`namespace tinker {`
`7`		`-void nextarg(size_t len, char* str, int& exist);`
	`7`	`+void nextarg(size_t len, char* str, bool& exist);`
`8`	`8`
`9`	`9`	`template <size_t Len>`
`10`		`-void nextarg(char (&str)[Len], int& exist)`
	`10`	`+void nextarg(char (&str)[Len], bool& exist)`
`11`	`11`	`{`
`12`	`12`	`nextarg(Len, str, exist);`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ void bounds()`
`154`	`154`	`copyPosToXyz();`
`155`	`155`	`}`
`156`	`156`
`157`		`-void readFrameCopyinToXyz(std::istream& ipt, int& done)`
	`157`	`+void readFrameCopyinToXyz(std::istream& ipt, bool& done)`
`158`	`158`	`{`
`159`	`159`	`if (done)`
`160`	`160`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -794,7 +794,7 @@ static void chgpenData(RcOp op)`
`794`	`794`	`namespace tinker {`
`795`	`795`	`bool useEwald()`
`796`	`796`	`{`
`797`		`- bool flag = useEnergyElec() and limits::use_ewald;`
	`797`	`+ bool flag = useEnergyElec() and static_cast<bool>(limits::use_ewald);`
`798`	`798`	`return flag;`
`799`	`799`	`}`
`800`	`800`