Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 13:23:50 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #481 from osresearch/master

Browse Source 
silence warnings on OSX clang3.0 (issue #480)
This commit is contained in:
R. Belmont 2015-11-30 08:58:36 -05:00
commit 0704504dc9
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/genie.lua
View File

@ -998,13 +998,9 @@ end
"-Wno-tautological-compare", "-Wno-tautological-compare",
"-Wno-dynamic-class-memaccess", "-Wno-dynamic-class-memaccess",
} }
if (version >= 30200) then if (version >= 30000) then
buildoptions { buildoptions {
"-Wno-unused-value", "-Wno-unused-value",
}
end
if (version >= 30400) then
buildoptions {
"-Wno-inline-new-delete", "-Wno-inline-new-delete",
"-Wno-constant-logical-operand", "-Wno-constant-logical-operand",
} }

2
src/devices/sound/samples.cpp
View File

@ -571,7 +571,7 @@ bool samples_device::read_flac_sample(emu_file &file, sample_t &sample)
file.seek(0, SEEK_SET); file.seek(0, SEEK_SET);
// create the FLAC decoder and fill in the sample data // create the FLAC decoder and fill in the sample data
flac_decoder decoder(file); flac_decoder decoder((core_file&) file);
sample.frequency = decoder.sample_rate(); sample.frequency = decoder.sample_rate();
// error if more than 1 channel or not 16bpp // error if more than 1 channel or not 16bpp

2
src/emu/emuopts.cpp
View File

@ -557,7 +557,7 @@ bool emu_options::parse_one_ini(const char *basename, int priority, std::string
// parse the file // parse the file
osd_printf_verbose("Parsing %s.ini\n", basename); osd_printf_verbose("Parsing %s.ini\n", basename);
std::string error; std::string error;
bool result = parse_ini_file(file, priority, OPTION_PRIORITY_DRIVER_INI, error); bool result = parse_ini_file((core_file&)file, priority, OPTION_PRIORITY_DRIVER_INI, error);
// append errors if requested // append errors if requested
if (!error.empty() && error_string != NULL) if (!error.empty() && error_string != NULL)