From e8ced30a84477e5111a85619095403e59f40fd6d Mon Sep 17 00:00:00 2001 From: gulrak Date: Sat, 4 May 2019 08:59:21 +0200 Subject: [PATCH] Fixed merge error leading to compile error. --- test/filesystem_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/filesystem_test.cpp b/test/filesystem_test.cpp index 7341752..e864622 100644 --- a/test/filesystem_test.cpp +++ b/test/filesystem_test.cpp @@ -119,9 +119,9 @@ struct StringMaker { std::time_t t = to_time_t(value); std::tm* ptm = std::localtime(&t); + std::ostringstream os; if (ptm) { std::tm ttm = *ptm; - std::ostringstream os; os << std::put_time(&ttm, "%Y-%m-%d %H:%M:%S"); } else {