Fix some compiler warnings, and suppress a few others for MSVC

This commit is contained in:
Chris Cannam
2023-12-15 20:32:57 +00:00
parent 97091aebe8
commit 91db97f8f5
6 changed files with 15 additions and 4 deletions

View File

@@ -152,7 +152,7 @@ system_is_multiprocessor()
#ifdef _WIN32 #ifdef _WIN32
void gettimeofday(struct timeval *tv, void *tz) void gettimeofday(struct timeval *tv, void * /* tz */)
{ {
union { union {
long long ns100; long long ns100;

View File

@@ -45,8 +45,12 @@
# define R__ # define R__
#endif #endif
#ifdef _MSC_VER
#pragma warning(disable:4127; disable:4244; disable:4267)
#else
#pragma GCC diagnostic ignored "-Wconversion" #pragma GCC diagnostic ignored "-Wconversion"
#pragma clang diagnostic ignored "-Wconversion" #pragma clang diagnostic ignored "-Wconversion"
#endif
#ifdef __clang__ #ifdef __clang__
# define RTENTRY__ __attribute__((annotate("realtime"))) # define RTENTRY__ __attribute__((annotate("realtime")))

View File

@@ -35,6 +35,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef _MSC_VER
#pragma warning (disable: 4131; disable: 4706)
#endif
int opterr = 1, /* if error message should be printed */ int opterr = 1, /* if error message should be printed */
optind = 1, /* index into parent argv vector */ optind = 1, /* index into parent argv vector */
optopt, /* character checked for validity */ optopt, /* character checked for validity */

View File

@@ -54,6 +54,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#ifdef _MSC_VER
#pragma warning (disable: 4131; disable: 4996)
#endif
GETOPT_API extern char opterrmsg[128]; GETOPT_API extern char opterrmsg[128];
char opterrmsg[128]; /* last error message is stored here */ char opterrmsg[128]; /* last error message is stored here */

View File

@@ -89,8 +89,7 @@ R2Stretcher::ChannelData::construct(const std::set<size_t> &sizes,
unityResetLow = 16000.f; unityResetLow = 16000.f;
for (std::set<size_t>::const_iterator i = sizes.begin(); for (i = sizes.begin(); i != sizes.end(); ++i) {
i != sizes.end(); ++i) {
ffts[*i] = new FFT(*i); ffts[*i] = new FFT(*i);
if (sizeof(process_t) == sizeof(double)) { if (sizeof(process_t) == sizeof(double)) {
ffts[*i]->initDouble(); ffts[*i]->initDouble();

View File

@@ -1006,7 +1006,7 @@ R3Stretcher::consume(bool final)
while (true) { while (true) {
Profiler profiler("R3Stretcher::consume/loop"); Profiler profiler2("R3Stretcher::consume/loop");
int readSpace = cd0->inbuf->getReadSpace(); int readSpace = cd0->inbuf->getReadSpace();
m_log.log(2, "consume: read space", readSpace); m_log.log(2, "consume: read space", readSpace);