Fixes for minor compile warnings in clang 6 and gcc 8.

Sorry that this is all I've been able to contribute for the past few weeks :(
This commit is contained in:
Stephen Anthony 2018-07-01 21:15:15 -02:30
parent 258fc9c106
commit d8b4228ead
6 changed files with 8 additions and 10 deletions

View File

@ -43,7 +43,6 @@ class AudioQueue
@param fragmentSize The size (in stereo / mono samples) of each fragment @param fragmentSize The size (in stereo / mono samples) of each fragment
@param capacity The number of fragments that can be queued before wrapping. @param capacity The number of fragments that can be queued before wrapping.
@param isStereo Whether samples are stereo or mono. @param isStereo Whether samples are stereo or mono.
@param sampleRate The sample rate. This is not used, but can be queried.
*/ */
AudioQueue(uInt32 fragmentSize, uInt32 capacity, bool isStereo); AudioQueue(uInt32 fragmentSize, uInt32 capacity, bool isStereo);

View File

@ -276,7 +276,6 @@ void SoundSDL2::initResampler()
default: default:
throw runtime_error("invalid resampling quality"); throw runtime_error("invalid resampling quality");
break;
} }
} }

View File

@ -310,7 +310,7 @@ bool Console::load(Serializer& in)
void Console::toggleFormat(int direction) void Console::toggleFormat(int direction)
{ {
string saveformat, message; string saveformat, message;
int format; uInt32 format = myCurrentFormat;
if(direction == 1) if(direction == 1)
format = (myCurrentFormat + 1) % 7; format = (myCurrentFormat + 1) % 7;
@ -321,7 +321,7 @@ void Console::toggleFormat(int direction)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Console::setFormat(int format) void Console::setFormat(uInt32 format)
{ {
if(myCurrentFormat == format) if(myCurrentFormat == format)
return; return;

View File

@ -199,7 +199,7 @@ class Console : public Serializable
/** /**
Set NTSC/PAL/SECAM (and variants) display format. Set NTSC/PAL/SECAM (and variants) display format.
*/ */
void setFormat(int format); void setFormat(uInt32 format);
/** /**
Toggle between the available palettes. Toggle between the available palettes.

View File

@ -128,7 +128,7 @@ class EmulationWorker
/** /**
Log a fatal error to cerr and throw a runtime exception. Log a fatal error to cerr and throw a runtime exception.
*/ */
void fatal(string message); [[noreturn]] void fatal(string message);
private: private:
/** /**

View File

@ -498,14 +498,14 @@ void GameInfoDialog::saveConfig()
// update display immediately // update display immediately
bool reset = false; bool reset = false;
instance().console().setFormat(myFormat->getSelected()); instance().console().setFormat(myFormat->getSelected());
if(myYStart->getValue() != TIAConstants::minYStart - 1 && if(uInt32(myYStart->getValue()) != TIAConstants::minYStart - 1 &&
myYStart->getValue() != instance().console().tia().ystart()) uInt32(myYStart->getValue()) != instance().console().tia().ystart())
{ {
instance().console().tia().setYStart(myYStart->getValue()); instance().console().tia().setYStart(myYStart->getValue());
reset = true; reset = true;
} }
if(myHeight->getValue() != TIAConstants::minViewableHeight - 1 && if(uInt32(myHeight->getValue()) != TIAConstants::minViewableHeight - 1 &&
myHeight->getValue() != instance().console().tia().height()) uInt32(myHeight->getValue()) != instance().console().tia().height())
{ {
instance().console().tia().setHeight(myHeight->getValue()); instance().console().tia().setHeight(myHeight->getValue());
reset = true; reset = true;