From eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Sun, 9 Sep 2018 18:53:23 -0400
Subject: pull in latest 10.4 from upstream

---
 wx+/graph.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'wx+/graph.cpp')

diff --git a/wx+/graph.cpp b/wx+/graph.cpp
index b006cda0..38846523 100755
--- a/wx+/graph.cpp
+++ b/wx+/graph.cpp
@@ -387,8 +387,8 @@ std::vector<CurvePoint> SparseCurveData::getPoints(double minX, double maxX, con
     for (int i = posFrom; i <= posTo; ++i)
     {
         const double x = cvrtX.screenToReal(i);
-        Opt<CurvePoint> ptLe = getLessEq(x);
-        Opt<CurvePoint> ptGe = getGreaterEq(x);
+        std::optional<CurvePoint> ptLe = getLessEq(x);
+        std::optional<CurvePoint> ptGe = getGreaterEq(x);
         //both non-existent and invalid return values are mapped to out of expected range: => check on posLe/posGe NOT ptLe/ptGe in the following!
         const int posLe = ptLe ? cvrtX.realToScreenRound(ptLe->x) : i + 1;
         const int posGe = ptGe ? cvrtX.realToScreenRound(ptGe->x) : i - 1;
-- 
cgit