From 4a02d3819fcaaa8e8d47ad2c23ee31a7242b3b2f Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Tue, 24 Aug 2021 14:20:03 +0900 Subject: [PATCH] Refactorings by using constexpr constants --- example02_threaded_raytracing/src/main.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/example02_threaded_raytracing/src/main.cpp b/example02_threaded_raytracing/src/main.cpp index ca6484e..9e4c2cb 100644 --- a/example02_threaded_raytracing/src/main.cpp +++ b/example02_threaded_raytracing/src/main.cpp @@ -1,5 +1,7 @@ +constexpr unsigned int DEFAULT_THREAD_COUNT = 1; constexpr unsigned int DEFAULT_WIDTH = 1600; constexpr unsigned int DEFAULT_HEIGHT = 1600; +constexpr const char *DEFAULT_OUTPUT_FILE = "raytrace_out"; #include #include @@ -22,10 +24,10 @@ void printHelp() { } int main(int argc, char **argv) { - int threadCount = 1; + unsigned int threadCount = DEFAULT_THREAD_COUNT; unsigned int outputWidth = DEFAULT_WIDTH; unsigned int outputHeight = DEFAULT_HEIGHT; - std::string outputFile = "raytrace_out"; + std::string outputFile = DEFAULT_OUTPUT_FILE; { auto results = Ex02::ArgParse::parseArgs(argc, argv, @@ -55,7 +57,7 @@ int main(int argc, char **argv) { const auto setThreadCount = [&threadCount](auto iter) { try { - threadCount = std::stoi(iter->second); + threadCount = std::stoul(iter->second); } catch (const std::invalid_argument &e) { std::cout << "ERROR: Failed to parse thread count (invalid)" << std::endl;