20 lines
569 B
Text
20 lines
569 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/migrate_work.cc
|
|
--- src/migrate_work.cc.orig
|
|
+++ src/migrate_work.cc
|
|
@@ -8,8 +8,8 @@
|
|
// PURPOSE.
|
|
|
|
#include "base.hh"
|
|
-#include "sanity.hh"
|
|
#include "cset.hh"
|
|
+#include "sanity.hh"
|
|
#include "simplestring_xform.hh"
|
|
#include "revision.hh"
|
|
#include "file_io.hh"
|