diff options
| author | B Stack <bgstack15@gmail.com> | 2018-09-09 18:53:23 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-09-09 18:53:23 -0400 |
| commit | eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba (patch) | |
| tree | 0f0441755ff0e6d65e12222d4502c648bffd6a7c /zen/zstring.cpp | |
| parent | 10.3 (diff) | |
| download | FreeFileSync-eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba.tar.gz FreeFileSync-eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba.tar.bz2 FreeFileSync-eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba.zip | |
pull in latest 10.4 from upstream
Diffstat (limited to 'zen/zstring.cpp')
| -rwxr-xr-x | zen/zstring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zen/zstring.cpp b/zen/zstring.cpp index 1fe31eaf..8bf77a0b 100755 --- a/zen/zstring.cpp +++ b/zen/zstring.cpp @@ -49,8 +49,8 @@ int compareNoCaseUtf8(const char* lhs, size_t lhsLen, const char* rhs, size_t rh impl::UtfDecoder<char> decR(rhs, rhsLen); for (;;) { - const Opt<impl::CodePoint> cpL = decL.getNext(); - const Opt<impl::CodePoint> cpR = decR.getNext(); + const std::optional<impl::CodePoint> cpL = decL.getNext(); + const std::optional<impl::CodePoint> cpR = decR.getNext(); if (!cpL || !cpR) return static_cast<int>(!cpR) - static_cast<int>(!cpL); |