Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 11:59:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2986

Browse Source 
373d1d50 epee: use strptime instead of std::get_time, for compatibility (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-01-10 11:51:20 +01:00
commit 2d60c9b738
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/epee/include/storages/portable_storage_val_converters.h
View File

@ -28,6 +28,7 @@
#pragma once #pragma once
#include <time.h>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include "misc_language.h" #include "misc_language.h"
@ -149,9 +150,8 @@ POP_WARNINGS
else if (boost::regex_match (from, boost::regex("\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\dZ"))) else if (boost::regex_match (from, boost::regex("\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\dZ")))
{ {
// Convert to unix timestamp // Convert to unix timestamp
std::tm tm = {}; struct tm tm;
std::istringstream ss(from); if (strptime(from.c_str(), "%Y-%m-%dT%H:%M:%S", &tm))
if (ss >> std::get_time(&tm, "%Y-%m-%dT%H:%M:%S"))
to = std::mktime(&tm); to = std::mktime(&tm);
} else } else
ASSERT_AND_THROW_WRONG_CONVERSION(); ASSERT_AND_THROW_WRONG_CONVERSION();