25 lines
650 B
Text
25 lines
650 B
Text
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/transforms.cc
|
|
--- src/transforms.cc.orig
|
|
+++ src/transforms.cc
|
|
@@ -12,11 +12,11 @@
|
|
#include <botan/botan.h>
|
|
#include <botan/sha160.h>
|
|
|
|
-#include "botan_pipe_cache.hh"
|
|
-#include "gzip.hh"
|
|
-
|
|
#include "transforms.hh"
|
|
#include "char_classifiers.hh"
|
|
+
|
|
+#include "botan_pipe_cache.hh"
|
|
+#include "gzip.hh"
|
|
|
|
using std::string;
|
|
using Botan::Pipe;
|