From 5333b6e1f8c517007b3075f282c48b5b72d1f95c Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Mon, 30 Sep 2013 12:00:06 +0200 Subject: [PATCH] algos_sig: fix min() macro name collision with STL --- src/algos_sig.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/algos_sig.cpp b/src/algos_sig.cpp index 4b20f15..3dbaf4e 100644 --- a/src/algos_sig.cpp +++ b/src/algos_sig.cpp @@ -53,7 +53,7 @@ * Then hash it as usual, FMTSeq it, publish the signature, enjoy. */ -#define min(a,b) ((a)<(b)?(a):(b)) +#define MIN(a,b) ((a)<(b)?(a):(b)) static void msg_pad (const bvector&in, std::vector&out, size_t minsize) { @@ -72,7 +72,7 @@ static void msg_pad (const bvector&in, std::vector&out, size_t minsize) //stuff in as much seed material as possible for (i = 0; i < (out.size() >> 8); ++i) { std::vector sub (out.begin() + (i << 8), - min (out.end(), + MIN (out.end(), out.begin() + ( (i + 1) << 8) ) ); g.load_key (sub); }