silence compiler warning on windows
This commit is contained in:
@ -593,7 +593,7 @@ void PairPolymorphic::read_file(char *file)
|
|||||||
|
|
||||||
if ((ng == 0) || (nr == 0) || (nx == 0))
|
if ((ng == 0) || (nr == 0) || (nx == 0))
|
||||||
error->one(FLERR,"Error reading potential file header");
|
error->one(FLERR,"Error reading potential file header");
|
||||||
} catch (TokenizerException &e) {
|
} catch (TokenizerException &) {
|
||||||
error->one(FLERR,"Potential file incompatible with this pair style version");
|
error->one(FLERR,"Potential file incompatible with this pair style version");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -412,7 +412,7 @@ void AngleTable::read_table(Table *tb, char *file, char *keyword)
|
|||||||
tb->afile[i] = values.next_double();
|
tb->afile[i] = values.next_double();
|
||||||
tb->efile[i] = values.next_double();
|
tb->efile[i] = values.next_double();
|
||||||
tb->ffile[i] = values.next_double();
|
tb->ffile[i] = values.next_double();
|
||||||
} catch (TokenizerException &e) {
|
} catch (TokenizerException &) {
|
||||||
++cerror;
|
++cerror;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -340,7 +340,7 @@ void BondTable::read_table(Table *tb, char *file, char *keyword)
|
|||||||
tb->rfile[i] = values.next_double();
|
tb->rfile[i] = values.next_double();
|
||||||
tb->efile[i] = values.next_double();
|
tb->efile[i] = values.next_double();
|
||||||
tb->ffile[i] = values.next_double();
|
tb->ffile[i] = values.next_double();
|
||||||
} catch (TokenizerException &e) {
|
} catch (TokenizerException &) {
|
||||||
++cerror;
|
++cerror;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -58,7 +58,8 @@ void Error::universe_all(const std::string &file, int line, const std::string &s
|
|||||||
std::string mesg = "ERROR: " + str;
|
std::string mesg = "ERROR: " + str;
|
||||||
try {
|
try {
|
||||||
mesg += fmt::format(" ({}:{})\n",truncpath(file),line);
|
mesg += fmt::format(" ({}:{})\n",truncpath(file),line);
|
||||||
} catch (fmt::format_error &e) {
|
} catch (fmt::format_error &) {
|
||||||
|
; // do nothing
|
||||||
}
|
}
|
||||||
if (universe->me == 0) {
|
if (universe->me == 0) {
|
||||||
if (universe->uscreen) fputs(mesg.c_str(),universe->uscreen);
|
if (universe->uscreen) fputs(mesg.c_str(),universe->uscreen);
|
||||||
@ -147,9 +148,9 @@ void Error::all(const std::string &file, int line, const std::string &str)
|
|||||||
std::string mesg = "ERROR: " + str;
|
std::string mesg = "ERROR: " + str;
|
||||||
if (input && input->line) lastcmd = input->line;
|
if (input && input->line) lastcmd = input->line;
|
||||||
try {
|
try {
|
||||||
mesg += fmt::format(" ({}:{})\nLast command: {}\n",
|
mesg += fmt::format(" ({}:{})\nLast command: {}\n", truncpath(file),line,lastcmd);
|
||||||
truncpath(file),line,lastcmd);
|
} catch (fmt::format_error &) {
|
||||||
} catch (fmt::format_error &e) {
|
; // do nothing
|
||||||
}
|
}
|
||||||
utils::logmesg(lmp,mesg);
|
utils::logmesg(lmp,mesg);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -407,7 +407,7 @@ void PairTable::read_table(Table *tb, char *file, char *keyword)
|
|||||||
rfile = values.next_double();
|
rfile = values.next_double();
|
||||||
tb->efile[i] = conversion_factor * values.next_double();
|
tb->efile[i] = conversion_factor * values.next_double();
|
||||||
tb->ffile[i] = conversion_factor * values.next_double();
|
tb->ffile[i] = conversion_factor * values.next_double();
|
||||||
} catch (TokenizerException &e) {
|
} catch (TokenizerException &) {
|
||||||
++cerror;
|
++cerror;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1172,7 +1172,7 @@ double utils::timespec2seconds(const std::string ×pec)
|
|||||||
if (!values.has_next()) break;
|
if (!values.has_next()) break;
|
||||||
vals[i] = values.next_int();
|
vals[i] = values.next_int();
|
||||||
}
|
}
|
||||||
} catch (TokenizerException &e) {
|
} catch (TokenizerException &) {
|
||||||
return -1.0;
|
return -1.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,10 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
|
#if defined(_WIN32)
|
||||||
|
#define strdup(x) _strdup(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
static int blank_line(char *line)
|
static int blank_line(char *line)
|
||||||
{
|
{
|
||||||
while (*line != '\0') {
|
while (*line != '\0') {
|
||||||
|
|||||||
Reference in New Issue
Block a user