From eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba Mon Sep 17 00:00:00 2001 From: B Stack Date: Sun, 9 Sep 2018 18:53:23 -0400 Subject: pull in latest 10.4 from upstream --- zen/zstring.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zen/zstring.cpp') 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 decR(rhs, rhsLen); for (;;) { - const Opt cpL = decL.getNext(); - const Opt cpR = decR.getNext(); + const std::optional cpL = decL.getNext(); + const std::optional cpR = decR.getNext(); if (!cpL || !cpR) return static_cast(!cpR) - static_cast(!cpL); -- cgit