From 126a5d45c14c364f046302e3040a0d9a3e2114ab Mon Sep 17 00:00:00 2001 From: Johannes Theiner Date: Mon, 18 Jun 2018 19:00:00 +0200 Subject: [PATCH] so jetzt --- 04_UDEF/RationalNumber.cpp | 2 +- 04_UDEF/main_04_UDEF_a.cpp | 2 +- 11_PUTT/02_Ment/LCDDisplay.cpp | 3 ++- CMakeLists.txt | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/04_UDEF/RationalNumber.cpp b/04_UDEF/RationalNumber.cpp index fe25204..20f3631 100644 --- a/04_UDEF/RationalNumber.cpp +++ b/04_UDEF/RationalNumber.cpp @@ -2,7 +2,7 @@ #include "RationalNumber.hpp" RationalNumber addRationalNumbers(RationalNumber left, RationalNumber right){ - RationalNumber result; + RationalNumber result = left; // add left and right return result; } diff --git a/04_UDEF/main_04_UDEF_a.cpp b/04_UDEF/main_04_UDEF_a.cpp index fd50ced..ef2894e 100644 --- a/04_UDEF/main_04_UDEF_a.cpp +++ b/04_UDEF/main_04_UDEF_a.cpp @@ -13,7 +13,7 @@ typedef RationalNumber calctype; // location 2 RationalNumber operator+(RationalNumber a, RationalNumber b) { - + return a; } std::string as_string(RationalNumber rationalNumber) { diff --git a/11_PUTT/02_Ment/LCDDisplay.cpp b/11_PUTT/02_Ment/LCDDisplay.cpp index e3ab267..0442cfa 100644 --- a/11_PUTT/02_Ment/LCDDisplay.cpp +++ b/11_PUTT/02_Ment/LCDDisplay.cpp @@ -49,5 +49,6 @@ int main(){ printf("F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF \r\n"); printf("RS=0 \r\n"); printf("02 /*Return Home*/ \r\n"); - getchar(); + //getchar(); + return 0; } diff --git a/CMakeLists.txt b/CMakeLists.txt index 95143dc..902741b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,14 +4,14 @@ project(test_build) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") add_executable(UDEF_1 04_UDEF/main_04_UDEF_e.cpp) -add_executable(UDEF_2 04_UDEF/main_04_UDEF_a.cpp) +#add_executable(UDEF_2 04_UDEF/main_04_UDEF_a.cpp) add_executable(UDEF_Testat 04_UDEF/Testat/Testat.cpp) add_executable(OO_A 05_OO/main_mp4_OO_a_vehicles.cpp) #add_executable(OO_B 05_OO/main_mp4_OO_b.cpp) -add_executable(OO_Shapes 05_OO/shapes_main.cpp) +#add_executable(OO_Shapes 05_OO/shapes_main.cpp) add_executable(SequenceDiagram 11_PUTT/05_OO_b/SequenceDiagramCreator.cpp 11_PUTT/05_OO_b/main.cpp)