aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee/include/storages
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-11-25 22:25:05 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-12-16 22:46:38 +0000
commit09ce03d612e54231694eee2fb9e5c807b2bfc341 (patch)
treef90f634f25079749febf00618ac3160d204f2d7a /contrib/epee/include/storages
parentMerge pull request #2881 (diff)
downloadmonero-09ce03d612e54231694eee2fb9e5c807b2bfc341.tar.xz
move includes around to lessen overall load
Diffstat (limited to 'contrib/epee/include/storages')
-rw-r--r--contrib/epee/include/storages/portable_storage_from_json.h2
-rw-r--r--contrib/epee/include/storages/portable_storage_to_bin.h1
-rw-r--r--contrib/epee/include/storages/portable_storage_val_converters.h4
3 files changed, 5 insertions, 2 deletions
diff --git a/contrib/epee/include/storages/portable_storage_from_json.h b/contrib/epee/include/storages/portable_storage_from_json.h
index 04b57376c..727f36552 100644
--- a/contrib/epee/include/storages/portable_storage_from_json.h
+++ b/contrib/epee/include/storages/portable_storage_from_json.h
@@ -25,6 +25,8 @@
//
#pragma once
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string/predicate.hpp>
#include "parserse_base_utils.h"
#include "file_io_utils.h"
diff --git a/contrib/epee/include/storages/portable_storage_to_bin.h b/contrib/epee/include/storages/portable_storage_to_bin.h
index 38e9f9098..9501bbc2a 100644
--- a/contrib/epee/include/storages/portable_storage_to_bin.h
+++ b/contrib/epee/include/storages/portable_storage_to_bin.h
@@ -28,6 +28,7 @@
#pragma once
+#include "pragma_comp_defs.h"
#include "misc_language.h"
#include "portable_storage_base.h"
diff --git a/contrib/epee/include/storages/portable_storage_val_converters.h b/contrib/epee/include/storages/portable_storage_val_converters.h
index f4a16cfae..52aa09eba 100644
--- a/contrib/epee/include/storages/portable_storage_val_converters.h
+++ b/contrib/epee/include/storages/portable_storage_val_converters.h
@@ -28,7 +28,7 @@
#pragma once
-#include <regex>
+#include <boost/regex.hpp>
#include "misc_language.h"
#include "portable_storage_base.h"
@@ -146,7 +146,7 @@ POP_WARNINGS
if(std::all_of(from.begin(), from.end(), ::isdigit))
to = boost::lexical_cast<uint64_t>(from);
// MyMonero ISO 8061 timestamp (2017-05-06T16:27:06Z)
- else if (std::regex_match (from, std::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
std::tm tm = {};