aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-02-17 18:44:06 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2014-02-17 18:45:10 +0100
commit0a0cf1433769e495839c5695f388b277b9ff2dfa (patch)
treec6eee487279af4e7eeaf14ed6a1c89a7d124cf78
parentb25d1c05095f51ba9bcfe5fc61f619fe5d95a866 (diff)
parenta143d4ce58d1103b37fa297fe6f4f4878eea59ca (diff)
downloadbitcoin-0a0cf1433769e495839c5695f388b277b9ff2dfa.tar.xz
Merge pull request #3691
a143d4c Fix crash in importwallet and dumpwallet formatting (Wladimir J. van der Laan)
-rw-r--r--src/rpcdump.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp
index a912ea7670..9e1d47846e 100644
--- a/src/rpcdump.cpp
+++ b/src/rpcdump.cpp
@@ -23,13 +23,13 @@ using namespace std;
void EnsureWalletIsUnlocked();
std::string static EncodeDumpTime(int64_t nTime) {
- return DateTimeStrFormat("%Y-%m-%"PRId64"T%H:%M:%SZ", nTime);
+ return DateTimeStrFormat("%Y-%m-%dT%H:%M:%SZ", nTime);
}
int64_t static DecodeDumpTime(const std::string &str) {
- static boost::posix_time::time_input_facet facet("%Y-%m-%dT%H:%M:%SZ");
static const boost::posix_time::ptime epoch = boost::posix_time::from_time_t(0);
- const std::locale loc(std::locale::classic(), &facet);
+ static const std::locale loc(std::locale::classic(),
+ new boost::posix_time::time_input_facet("%Y-%m-%dT%H:%M:%SZ"));
std::istringstream iss(str);
iss.imbue(loc);
boost::posix_time::ptime ptime(boost::date_time::not_a_date_time);