From ff14e988300d21b5e76921958497f8c7a2a0c8c3 Mon Sep 17 00:00:00 2001 From: cxl Date: Sat, 22 Nov 2014 10:07:33 +0000 Subject: [PATCH] .cosmetics git-svn-id: svn://ultimatepp.org/upp/trunk@7916 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- autotest/Time/Time.cpp | 4 ---- tutorial/Gui12/main.cpp | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/autotest/Time/Time.cpp b/autotest/Time/Time.cpp index 08c2daead..ce3064892 100644 --- a/autotest/Time/Time.cpp +++ b/autotest/Time/Time.cpp @@ -11,11 +11,7 @@ CONSOLE_APP_MAIN DUMP(GetTimeZone()); Date d = GetSysDate(); if(d < Date(d.year, 3, 20) && d > Date(d.year - 1, 10, 30)) { -<<<<<<< .mine LOG("Normalni CZ time"); -======= - LOG("Normal CZ time"); ->>>>>>> .r7914 ASSERT(GetTimeZone() == 60); ASSERT(ScanWwwTime("Tue, 25 Mar 2014 12:01:15 +1200") == Time(2014, 3, 25, 23, 1, 15)); ASSERT(ScanWwwTime("Tue, 25 Mar 2014 12:01:15 +1000") == Time(2014, 3, 25, 21, 1, 15)); diff --git a/tutorial/Gui12/main.cpp b/tutorial/Gui12/main.cpp index c8d97ade4..cf20873fa 100644 --- a/tutorial/Gui12/main.cpp +++ b/tutorial/Gui12/main.cpp @@ -46,9 +46,9 @@ struct MyAppWindow : TopWindow { AddFrame(status); AddFrame(InsetFrame()); menu.Set(THISBACK(MainMenu)); - menu.WhenHelp = status; - tool.Set(THISBACK(SubBar)); - tool.WhenHelp = status; + menu.WhenHelp = status; // callback cast to fix it for older CLANG version in C++11 + tool.Set(THISBACK(SubBar)); + tool.WhenHelp = status; // callback cast to fix it for older CLANG version in C++11 } };