[BACK]Return to patch-src_enumerator.cc CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / devel / monotone / patches

File: [cvs.NetBSD.org] / pkgsrc / devel / monotone / patches / patch-src_enumerator.cc (download)

Revision 1.1, Sat Mar 6 08:57:54 2021 UTC (3 years ago) by nia
Branch: MAIN
CVS Tags: pkgsrc-2023Q4-base, pkgsrc-2023Q4, pkgsrc-2023Q3-base, pkgsrc-2023Q3, pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, HEAD

monotone: Fix building with recent boost and Lua 5.4

Patches from Fedora.

$NetBSD: patch-src_enumerator.cc,v 1.1 2021/03/06 08:57:54 nia Exp $

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.

https://src.fedoraproject.org/fork/jjames/rpms/monotone/raw/84e80f1b992f0b0dba6cfe98eb9d0c55ea39623f/f/monotone-1.1-boost.patch

--- src/enumerator.cc.orig	2014-05-04 09:15:16.000000000 +0000
+++ src/enumerator.cc
@@ -11,9 +11,9 @@
 #include <deque>
 #include <map>
 #include <set>
-#include "vector.hh"
 
 #include "cset.hh"
+#include "vector.hh"
 #include "enumerator.hh"
 #include "revision.hh"
 #include "vocab.hh"