From 121ae391c03e502f4a5243e5bf4fd8ea06799927 Mon Sep 17 00:00:00 2001 From: cigerxwinchaker Date: Thu, 7 Nov 2019 18:05:59 +0100 Subject: [PATCH] test push der aktuellen quelldateien --- main/main.cpp | 4 ++-- src/SharedMemory.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index 261829f..fdf836c 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -22,10 +22,10 @@ int main(int argc, char** argv) //if verschieden information ausgaben if(eingabe == "info") { - std::cout << "OUTPUT ------------------------ OUTPUT" << std::endl; + std::cout << "OUTPUT ------------------------ OUTPUT\n" << std::endl; std::cout << "memory ID: " << shmget(impl.sharedMemoryKey, 0, 0) << std::endl; std::cout << "Max memory Size: " << Max_Memory_Size << std::endl; - std::cout << "OUTPUT ------------------------ OUTPUT" << std::endl; + std::cout << "OUTPUT ------------------------ OUTPUT\n" << std::endl; //Memory that is used now //outprint of all memory } diff --git a/src/SharedMemory.cpp b/src/SharedMemory.cpp index 3f7c3cc..77520f6 100644 --- a/src/SharedMemory.cpp +++ b/src/SharedMemory.cpp @@ -23,6 +23,7 @@ std::string getAnswerFromUser() std::cout << "wrong input: pls answer with (y) for yes, (n) for no, or (override)\n"; getAnswerFromUser(); } + return "-0"; } @@ -48,7 +49,7 @@ void initSharedMemory(void) { initSharedMemory(); } } else { - std::cout << "Shared Memory ist (Re-) allocated with Key: " << impl.sharedMemoryKey << std::endl; + std::cout << "Shared Memory is (Re-) allocated with Key: " << impl.sharedMemoryKey << std::endl; } } else { std::cerr <<"key -> " << impl.sharedMemoryKey << " is not allowed here " << std::endl;