From 6b60d6e44ba20720ca589935ee0d62580bd5f0e1 Mon Sep 17 00:00:00 2001 From: incredibleLeitman Date: Tue, 6 Oct 2020 14:45:30 +0200 Subject: [PATCH] just return a copy of the input array (TODO: use pointer as param) --- fileHandler.h | 7 +++---- main.cpp | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fileHandler.h b/fileHandler.h index 9a2317d..633f9f9 100644 --- a/fileHandler.h +++ b/fileHandler.h @@ -5,7 +5,7 @@ #include #include -std::vector& readFromFile(const char* filePath) +std::vector readFromFile(const char* filePath) { std::vector numbers; std::cout << "read file: " << filePath << "..." << std::endl; @@ -22,12 +22,11 @@ std::vector& readFromFile(const char* filePath) size_t idx = 0; while (in.good() && idx < count) { std::getline(in, line); - std::cout << "readline: " << line << std::endl; //long val = std::stol(line); //std::cout << "as long: " << val << std::endl; unsigned long ulval = std::stoul(line); - std::cout << "as unsigned long: " << ulval << std::endl; - numbers.push_back(ulval); + //std::cout << "as unsigned long: " << ulval << std::endl; + numbers.push_back((size_t)ulval); // auto cast to uint idx++; } } diff --git a/main.cpp b/main.cpp index 9a6a266..2b20cf8 100644 --- a/main.cpp +++ b/main.cpp @@ -6,6 +6,7 @@ int main(int argc, char** argv) { Timing::getInstance()->startRecord("init"); std::vector numbers = readFromFile("testdata"); + std::cout << "read " << numbers.size() << " values" << std::endl; Timing::getInstance()->stopRecord("init"); Timing::getInstance()->startRecord("test");