From 7c09f45f501a8ae6573d62e833c4ddfe4ab8b3aa Mon Sep 17 00:00:00 2001 From: akater Date: Tue, 3 Mar 2020 01:13:39 +0000 Subject: Specify namespace of uintmax_t This fixes #1833 for me. @jwiegley said it's reasonable change, and nobody else took action so here it goes. The patch is the same as proposed originally, modulo whitespace. --- src/filters.cc | 2 +- src/filters.h | 2 +- src/journal.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/filters.cc b/src/filters.cc index 98288880..564c5f97 100644 --- a/src/filters.cc +++ b/src/filters.cc @@ -253,7 +253,7 @@ void anonymize_posts::operator()(post_t& post) xact.copy_details(*post.xact); std::ostringstream buf; - buf << reinterpret_cast(post.xact->payee.c_str()) + buf << reinterpret_cast(post.xact->payee.c_str()) << integer_gen() << post.xact->payee.c_str(); sha.reset(); diff --git a/src/filters.h b/src/filters.h index cf053a24..5c517c95 100644 --- a/src/filters.h +++ b/src/filters.h @@ -371,7 +371,7 @@ class anonymize_posts : public item_handler public: anonymize_posts(post_handler_ptr handler) : item_handler(handler), next_comm_id(0), last_xact(NULL), - rnd_gen(static_cast(static_cast(std::time(0)))), + rnd_gen(static_cast(static_cast(std::time(0)))), integer_range(1, 2000000000L), integer_gen(rnd_gen, integer_range) { TRACE_CTOR(anonymize_posts, "post_handler_ptr"); diff --git a/src/journal.h b/src/journal.h index 3fefe4e1..0b0c7850 100644 --- a/src/journal.h +++ b/src/journal.h @@ -77,10 +77,10 @@ class journal_t : public noncopyable public: struct fileinfo_t { - optional filename; - uintmax_t size; - datetime_t modtime; - bool from_stream; + optional filename; + boost::uintmax_t size; + datetime_t modtime; + bool from_stream; fileinfo_t() : size(0), from_stream(true) { TRACE_CTOR(journal_t::fileinfo_t, ""); -- cgit v1.2.3