From 0ece8ea785f017c20b26f4aaa2676093b53dc710 Mon Sep 17 00:00:00 2001 From: Johannes Theiner Date: Sun, 19 Aug 2018 18:48:08 +0200 Subject: [PATCH] whupsi, broke all of it. --- 01_ENV/MP/main.c | 3 ++- 03_FLOW_a/MP/main_mp2_FLOW_a.cpp | 2 +- 03_FLOW_a/Testat/main_mp2_FLOW_a.cpp | 5 +++-- CMakeLists.txt | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/01_ENV/MP/main.c b/01_ENV/MP/main.c index 7a7bd49..794c3f9 100644 --- a/01_ENV/MP/main.c +++ b/01_ENV/MP/main.c @@ -50,5 +50,6 @@ int main(int argc, char **argv) { printf("\n"); local = sum(global, local); - return local; + printf("Local : %d\n", local); + return 0; } diff --git a/03_FLOW_a/MP/main_mp2_FLOW_a.cpp b/03_FLOW_a/MP/main_mp2_FLOW_a.cpp index 6ee6c86..032dd89 100644 --- a/03_FLOW_a/MP/main_mp2_FLOW_a.cpp +++ b/03_FLOW_a/MP/main_mp2_FLOW_a.cpp @@ -1,5 +1,5 @@ #include /* file main_mp2_FLOW_a.cpp */ -#include "AnsiConsole.h" +#include "../../helpers/AnsiConsole.h" AnsiConsole console; int firstLine; int currentTick; Colors currentColor; #define INITPRINT(label) {firstLine=__LINE__;console.printText(2*currentTick,0,label,Colors::BLACK);} diff --git a/03_FLOW_a/Testat/main_mp2_FLOW_a.cpp b/03_FLOW_a/Testat/main_mp2_FLOW_a.cpp index 62d9796..04829db 100644 --- a/03_FLOW_a/Testat/main_mp2_FLOW_a.cpp +++ b/03_FLOW_a/Testat/main_mp2_FLOW_a.cpp @@ -1,5 +1,5 @@ #include /* file main_mp2_FLOW_a.cpp */ -#include "AnsiConsole.h" +#include "../../helpers/AnsiConsole.h" AnsiConsole console; int firstLine; int currentTick; Colors currentColor; #define INITPRINT(label) {firstLine=__LINE__;console.printText(2*currentTick,0,label,Colors::BLACK);} @@ -8,6 +8,7 @@ void printLineNumber(int lineNumber); void help(int i); void help2(); +void recurse2(int i, int rounds); @@ -24,7 +25,7 @@ void recurse2(int i, int rounds) { else return; - PRINT;recurse2(i-1);return; + PRINT;recurse2(i-1, 2); } void help2() {PRINT; recurse2(3, 1); diff --git a/CMakeLists.txt b/CMakeLists.txt index a88e33a..729cdbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ add_executable(02_MENT_MP 02_MENT/MP/main_02_MENT.cpp) add_executable(02_MENT_Testat_1 02_MENT/Testat/main_02_MENT.cpp) add_executable(02_MENT_Testat_2 02_MENT/Testat2/main_02_MENT.cpp) -add_executable(03_FLOW_MP 03_FLOW_a/MP/main_mp2_FLOW_a.cpp) -add_executable(03_FLOW_Testat 03_FLOW_a/Testat/main_mp2_FLOW_a.cpp) +add_executable(03_FLOW_MP 03_FLOW_a/MP/main_mp2_FLOW_a.cpp helpers/AnsiConsole.cpp) +add_executable(03_FLOW_Testat 03_FLOW_a/Testat/main_mp2_FLOW_a.cpp helpers/AnsiConsole.cpp) add_executable(04_UDEF_MP_1 04_UDEF/MP/main_04_UDEF_e.cpp) add_executable(04_UDEF_MP_2 04_UDEF/MP/main_04_UDEF_a.cpp)