monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] net.venge.monotone: ab1768da0fde81a823a77f7b92c


From: code
Subject: [Monotone-commits-diffs] net.venge.monotone: ab1768da0fde81a823a77f7b92cb6bf6f1662b45
Date: Wed, 2 May 2012 13:22:34 +0200 (CEST)

revision:            ab1768da0fde81a823a77f7b92cb6bf6f1662b45
date:                2012-05-02T11:22:17
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
* test/unit/tests/xdelta.cc: Because boost v 1.47 and 1.48 also define the
  L macro, we run into trouble if we do it first.  Moving the inclusion of
  boost/random.hpp up a bit helps.
  Patch by Dan Horák

manifest:
format_version "1"

new_manifest [ea79989daa59b3f69f947ef3a26d3769b9285240]

old_revision [843bf4fa01c35f71ee512558c355c398d1d22311]

patch "test/unit/tests/xdelta.cc"
 from [4aff975cfd9a9cf18c26f70118e2895880ed6100]
   to [ed5f467ebc4755f7521e74a40833181974b43a8f]
============================================================
--- test/unit/tests/xdelta.cc	4aff975cfd9a9cf18c26f70118e2895880ed6100
+++ test/unit/tests/xdelta.cc	ed5f467ebc4755f7521e74a40833181974b43a8f
@@ -8,11 +8,16 @@
 // PURPOSE.
 
 #include "../../../src/base.hh"
+
+// <boost/math/special_functions/detail/lgamma_small.hpp> uses L().
+// This conflicts with a #define in "../../../src/sanity.hh".
+// Workaround: Include BOOST header before "../../../src/xdelta.hh".
+#include <boost/random.hpp>
+
 #include "../unit_tests.hh"
 #include "../../../src/xdelta.hh"
 
 #include "../../../src/adler32.hh"
-#include <boost/random.hpp>
 
 boost::mt19937 xdelta_prng;
 boost::uniform_smallint<char> xdelta_chargen('a', 'z');

reply via email to

[Prev in Thread] Current Thread [Next in Thread]