devel/monotone/patches/patch-src_commands.hh


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23

$NetBSD: patch-src_commands.hh,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/commands.hh.orig	2014-05-04 09:15:16.000000000 +0000
+++ src/commands.hh
@@ -10,8 +10,8 @@
 #ifndef __COMMANDS_HH__
 #define __COMMANDS_HH__
 
-#include "vector.hh"
 #include "options.hh"
+#include "vector.hh"
 class app_state;
 class utf8;