blob: 5791dbfaf922c2ad2da3fa73638f7ccce71de31f (
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
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
diff --git a/src/include/uuid.h b/src/include/uuid.h
index f6ef9878dae..352af8a2034 100644
--- a/src/include/uuid.h
+++ b/src/include/uuid.h
@@ -60,7 +60,7 @@ struct uuid_d {
}
const char *bytes() const {
- return (const char*)uuid.data;
+ return (const char*)uuid.data();
}
void encode(::ceph::buffer::list::contiguous_appender& p) const {
diff --git a/src/mgr/PyModule.cc b/src/mgr/PyModule.cc
index 084cf3ffc1e..010a1177a88 100644
--- a/src/mgr/PyModule.cc
+++ b/src/mgr/PyModule.cc
@@ -36,6 +36,11 @@ std::string PyModule::mgr_store_prefix = "mgr/";
// Courtesy of http://stackoverflow.com/questions/1418015/how-to-get-python-exception-text
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+// Fix instances of "'BOOST_PP_ITERATION_02' was not declared in this scope; did you mean 'BOOST_PP_ITERATION_05'"
+// and related macro error bullshit that spans 300 lines of errors
+//
+// Apparently you can't include boost/python stuff _and_ have this header defined
+#undef BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
// Boost apparently can't be bothered to fix its own usage of its own
// deprecated features.
#include <boost/python/extract.hpp>
diff --git a/src/test/objectstore/Allocator_aging_fragmentation.cc b/src/test/objectstore/Allocator_aging_fragmentation.cc
index 220f8841b8e..6ddfb02b1dd 100755
--- a/src/test/objectstore/Allocator_aging_fragmentation.cc
+++ b/src/test/objectstore/Allocator_aging_fragmentation.cc
@@ -19,6 +19,7 @@
#include "os/bluestore/Allocator.h"
#include <boost/random/uniform_int.hpp>
+#include <boost/random/mersenne_twister.hpp>
typedef boost::mt11213b gen_type;
diff --git a/src/test/objectstore/Allocator_bench.cc b/src/test/objectstore/Allocator_bench.cc
index 0d04a854e9a..5218207d2c2 100644
--- a/src/test/objectstore/Allocator_bench.cc
+++ b/src/test/objectstore/Allocator_bench.cc
@@ -15,6 +15,7 @@
#include "os/bluestore/Allocator.h"
#include <boost/random/uniform_int.hpp>
+#include <boost/random/mersenne_twister.hpp>
typedef boost::mt11213b gen_type;
#include "common/debug.h"
diff --git a/src/test/objectstore/Allocator_test.cc b/src/test/objectstore/Allocator_test.cc
index b006500153c..0edea1d4ac1 100644
--- a/src/test/objectstore/Allocator_test.cc
+++ b/src/test/objectstore/Allocator_test.cc
@@ -14,6 +14,8 @@
#include "include/Context.h"
#include "os/bluestore/Allocator.h"
+#include <boost/random/mersenne_twister.hpp>
+
using namespace std;
typedef boost::mt11213b gen_type;
|