diff options
| author | Chris Robinson <[email protected]> | 2019-04-11 16:01:11 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-04-11 16:01:11 -0700 |
| commit | 4b95d310aee4e6aa0485a6c637701bd2850c7968 (patch) | |
| tree | f716c4d6d5808cfc5193953ec3f4ed7355164274 /Alc/ambdec.cpp | |
| parent | 8215251571847c4a2e1f07338fdc1667a8b52809 (diff) | |
Remove the SZFMT macro
C++11 mandates the %zu/d formatter
Diffstat (limited to 'Alc/ambdec.cpp')
| -rw-r--r-- | Alc/ambdec.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Alc/ambdec.cpp b/Alc/ambdec.cpp index e37a5a09..0991cfc5 100644 --- a/Alc/ambdec.cpp +++ b/Alc/ambdec.cpp @@ -91,15 +91,15 @@ bool load_ambdec_speakers(al::vector<AmbDecConf::SpeakerConf> &spkrs, const std: const size_t spkr_num{spkrs.size()}; istr >> spkr.Name; - if(istr.fail()) WARN("Name not specified for speaker " SZFMT "\n", spkr_num); + if(istr.fail()) WARN("Name not specified for speaker %zu\n", spkr_num); istr >> spkr.Distance; - if(istr.fail()) WARN("Distance not specified for speaker " SZFMT "\n", spkr_num); + if(istr.fail()) WARN("Distance not specified for speaker %zu\n", spkr_num); istr >> spkr.Azimuth; - if(istr.fail()) WARN("Azimuth not specified for speaker " SZFMT "\n", spkr_num); + if(istr.fail()) WARN("Azimuth not specified for speaker %zu\n", spkr_num); istr >> spkr.Elevation; - if(istr.fail()) WARN("Elevation not specified for speaker " SZFMT "\n", spkr_num); + if(istr.fail()) WARN("Elevation not specified for speaker %zu\n", spkr_num); istr >> spkr.Connection; - if(istr.fail()) TRACE("Connection not specified for speaker " SZFMT "\n", spkr_num); + if(istr.fail()) TRACE("Connection not specified for speaker %zu\n", spkr_num); } else { @@ -149,7 +149,7 @@ bool load_ambdec_matrix(float (&gains)[MAX_AMBI_ORDER+1], al::vector<AmbDecConf: if(istr.fail()) break; if(!istr.eof() && !std::isspace(istr.peek())) { - ERR("Extra junk on gain " SZFMT ": %s\n", curgain+1, + ERR("Extra junk on gain %zu: %s\n", curgain+1, buffer.c_str()+static_cast<std::size_t>(istr.tellg())); return false; } @@ -171,7 +171,7 @@ bool load_ambdec_matrix(float (&gains)[MAX_AMBI_ORDER+1], al::vector<AmbDecConf: if(istr.fail()) break; if(!istr.eof() && !std::isspace(istr.peek())) { - ERR("Extra junk on matrix element " SZFMT "x" SZFMT ": %s\n", curidx, + ERR("Extra junk on matrix element %zux%zu: %s\n", curidx, matrix.size(), buffer.c_str()+static_cast<std::size_t>(istr.tellg())); matrix.pop_back(); return false; |