aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-12-21 16:04:47 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-12-21 16:04:47 +0000
commit373d1d504b1dc2af7c643ec00e93b235e4d13a78 (patch)
tree03a7ccf94a2b5906501b88b6534568ab16de28fa /contrib
parentMerge pull request #2961 (diff)
downloadmonero-373d1d504b1dc2af7c643ec00e93b235e4d13a78.tar.xz
epee: use strptime instead of std::get_time, for compatibility
Diffstat (limited to 'contrib')
-rw-r--r--contrib/epee/include/storages/portable_storage_val_converters.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/epee/include/storages/portable_storage_val_converters.h b/contrib/epee/include/storages/portable_storage_val_converters.h
index 52aa09eba..5d9664a65 100644
--- a/contrib/epee/include/storages/portable_storage_val_converters.h
+++ b/contrib/epee/include/storages/portable_storage_val_converters.h
@@ -28,6 +28,7 @@
#pragma once
+#include <time.h>
#include <boost/regex.hpp>
#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")))
{
// Convert to unix timestamp
- std::tm tm = {};
- std::istringstream ss(from);
- if (ss >> std::get_time(&tm, "%Y-%m-%dT%H:%M:%S"))
+ struct tm tm;
+ if (strptime(from.c_str(), "%Y-%m-%dT%H:%M:%S", &tm))
to = std::mktime(&tm);
} else
ASSERT_AND_THROW_WRONG_CONVERSION();