From 25deff1aba301bfa19a71a7572d944837f87f5e5 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 11 Jul 2019 21:59:43 +0000 Subject: [PATCH] ide: fixed to compile with CLANG git-svn-id: svn://ultimatepp.org/upp/trunk@13487 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/GtkEvent.cpp | 2 +- uppsrc/TextDiffCtrl/patch.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlCore/GtkEvent.cpp b/uppsrc/CtrlCore/GtkEvent.cpp index 9c3cc30af..5ba8f3edf 100644 --- a/uppsrc/CtrlCore/GtkEvent.cpp +++ b/uppsrc/CtrlCore/GtkEvent.cpp @@ -73,7 +73,7 @@ Ctrl *Ctrl::GetTopCtrlFromId(int id) int q = FindId(id); if(q >= 0) { Ctrl *p = wins[q].ctrl; - if(p && p->top)50 + if(p && p->top) return p; } return NULL; diff --git a/uppsrc/TextDiffCtrl/patch.cpp b/uppsrc/TextDiffCtrl/patch.cpp index e02d77686..4202067f3 100644 --- a/uppsrc/TextDiffCtrl/patch.cpp +++ b/uppsrc/TextDiffCtrl/patch.cpp @@ -144,7 +144,7 @@ String Patch::GetPatchedFile(int i) const String path = GetPath(i); if(FileExists(path)) { String s = LoadFile(GetPath(i)); - bool crlf = s.Find('\r') >= 0; + crlf = s.Find('\r') >= 0; lines = Split(Filter(s, [](int c) { return c == '\r' ? 0 : c; }), '\n', false); }