diff --git a/src/common/sysutils.cpp b/src/common/sysutils.cpp index 49e2914..c5779b6 100644 --- a/src/common/sysutils.cpp +++ b/src/common/sysutils.cpp @@ -152,7 +152,7 @@ system_is_multiprocessor() #ifdef _WIN32 -void gettimeofday(struct timeval *tv, void *tz) +void gettimeofday(struct timeval *tv, void * /* tz */) { union { long long ns100; diff --git a/src/common/sysutils.h b/src/common/sysutils.h index 334917d..5c6212f 100644 --- a/src/common/sysutils.h +++ b/src/common/sysutils.h @@ -45,8 +45,12 @@ # define R__ #endif +#ifdef _MSC_VER +#pragma warning(disable:4127; disable:4244; disable:4267) +#else #pragma GCC diagnostic ignored "-Wconversion" #pragma clang diagnostic ignored "-Wconversion" +#endif #ifdef __clang__ # define RTENTRY__ __attribute__((annotate("realtime"))) diff --git a/src/ext/getopt/getopt.c b/src/ext/getopt/getopt.c index ce9abb3..1ca7d77 100644 --- a/src/ext/getopt/getopt.c +++ b/src/ext/getopt/getopt.c @@ -35,6 +35,10 @@ #include #include +#ifdef _MSC_VER +#pragma warning (disable: 4131; disable: 4706) +#endif + int opterr = 1, /* if error message should be printed */ optind = 1, /* index into parent argv vector */ optopt, /* character checked for validity */ diff --git a/src/ext/getopt/getopt_long.c b/src/ext/getopt/getopt_long.c index 1f92449..f5cd244 100644 --- a/src/ext/getopt/getopt_long.c +++ b/src/ext/getopt/getopt_long.c @@ -54,6 +54,10 @@ #include #include +#ifdef _MSC_VER +#pragma warning (disable: 4131; disable: 4996) +#endif + GETOPT_API extern char opterrmsg[128]; char opterrmsg[128]; /* last error message is stored here */ diff --git a/src/faster/StretcherChannelData.cpp b/src/faster/StretcherChannelData.cpp index 640ddb4..8cbe423 100644 --- a/src/faster/StretcherChannelData.cpp +++ b/src/faster/StretcherChannelData.cpp @@ -89,8 +89,7 @@ R2Stretcher::ChannelData::construct(const std::set &sizes, unityResetLow = 16000.f; - for (std::set::const_iterator i = sizes.begin(); - i != sizes.end(); ++i) { + for (i = sizes.begin(); i != sizes.end(); ++i) { ffts[*i] = new FFT(*i); if (sizeof(process_t) == sizeof(double)) { ffts[*i]->initDouble(); diff --git a/src/finer/R3Stretcher.cpp b/src/finer/R3Stretcher.cpp index ea1b2c8..81524b9 100644 --- a/src/finer/R3Stretcher.cpp +++ b/src/finer/R3Stretcher.cpp @@ -1006,7 +1006,7 @@ R3Stretcher::consume(bool final) while (true) { - Profiler profiler("R3Stretcher::consume/loop"); + Profiler profiler2("R3Stretcher::consume/loop"); int readSpace = cd0->inbuf->getReadSpace(); m_log.log(2, "consume: read space", readSpace);