Skip to content

Commit

Permalink
Fixed merge error leading to compile error.
Browse files Browse the repository at this point in the history
  • Loading branch information
gulrak committed May 4, 2019
1 parent dac42f8 commit e8ced30
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/filesystem_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ struct StringMaker<fs::file_time_type>
{
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 {
Expand Down

0 comments on commit e8ced30

Please sign in to comment.