SecBSD's official ports repository

devel/monotone/patches/patch-src_sanity_cc

@@ -0,0 +1,26 @@
+A function macro named E clashes with internal boost definitions.  Rearrange
+the order of header inclusion so that affected boost headers are included
+before monotone defines the macro.
+
+Also, stop bundling boost/circular_buffer, which is available in current
+versions of boost. From Fedora.
+
+Index: src/sanity.cc
+--- src/sanity.cc.orig
++++ src/sanity.cc
+@@ -12,12 +12,11 @@
+ #include <iterator>
+ #include <fstream>
+ #include <sstream>
+-#include "vector.hh"
+-
+ #include <boost/format.hpp>
+ 
+-// circular_buffer is not in Boost 1.34; it's in monotone/boost.
+-#include "boost/circular_buffer.hpp"
++#include "vector.hh"
++
++#include <boost/circular_buffer.hpp>
+ 
+ #include "lexical_cast.hh"
+ #include "constants.hh"