aboutsummaryrefslogtreecommitdiffstats
path: root/utils/makemhr/loaddef.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2023-05-04 08:03:40 -0700
committerChris Robinson <[email protected]>2023-05-04 08:03:40 -0700
commit7cda37a67c8f147536c53f0073df9a9e61d40587 (patch)
tree68a0997c94ec905dd3438f26418234bf63aa76f4 /utils/makemhr/loaddef.cpp
parent40483b512218bab50fccaaeb11b51e5ca528fbe1 (diff)
Replace al::optional with std::optional
Diffstat (limited to 'utils/makemhr/loaddef.cpp')
-rw-r--r--utils/makemhr/loaddef.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/utils/makemhr/loaddef.cpp b/utils/makemhr/loaddef.cpp
index e8092363..84fbb48b 100644
--- a/utils/makemhr/loaddef.cpp
+++ b/utils/makemhr/loaddef.cpp
@@ -33,11 +33,10 @@
#include <iterator>
#include <limits>
#include <memory>
-#include <cstdarg>
+#include <optional>
#include <vector>
#include "alfstream.h"
-#include "aloptional.h"
#include "alspan.h"
#include "alstring.h"
#include "makemhr.h"
@@ -1755,7 +1754,7 @@ static int ProcessSources(TokenReaderT *tr, HrirDataT *hData, const uint outRate
PPhaseResampler onsetResampler;
onsetResampler.init(hData->mIrRate, OnsetRateMultiple*hData->mIrRate);
- al::optional<PPhaseResampler> resampler;
+ std::optional<PPhaseResampler> resampler;
if(outRate && outRate != hData->mIrRate)
resampler.emplace().init(hData->mIrRate, outRate);
const double rateScale{outRate ? static_cast<double>(outRate) / hData->mIrRate : 1.0};