blob: 0993b370716d757a7fafba2210bcd084713998b1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
$NetBSD: patch-src_cmd__list.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/cmd_list.cc.orig 2014-05-04 09:15:16.000000000 +0000
+++ src/cmd_list.cc
@@ -10,7 +10,6 @@
#include "base.hh"
#include <algorithm>
-#include "safe_map.hh"
#include <utility>
#include <iostream>
#include <iterator>
@@ -18,6 +17,7 @@
#include <boost/tuple/tuple.hpp>
#include "basic_io.hh"
+#include "safe_map.hh"
#include "cert.hh"
#include "charset.hh"
#include "cmd.hh"
|
