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
|
Fix building in C++14 mode
--- a/wrappers/py_geoms1.cpp
+++ b/wrappers/py_geoms1.cpp
@@ -142,7 +142,7 @@
string name = it->first;
const PrimVarInfo& info = it->second;
it++;
- return make_tuple(name, info.storage, info.type, info.multiplicity);
+ return boost::python::make_tuple(name, info.storage, info.type, info.multiplicity);
}
}
@@ -163,7 +163,7 @@
}
else
{
- return make_tuple(name, info->storage, info->type, info->multiplicity);
+ return boost::python::make_tuple(name, info->storage, info->type, info->multiplicity);
}
}
--- a/wrappers/py_slot.h
+++ b/wrappers/py_slot.h
@@ -40,7 +40,7 @@
// .def("onValueChanged", &Slot<double>::onValueChanged, &SlotWrapper<double>::base_onValueChanged)
// This macro can be used to create a new Python array slot type
-#define ARRAYSLOT(sname,stype) class_<_ArraySlotIterator<stype> >("_"sname"_Iterator", init<ArraySlot<stype>&>()) \
+#define ARRAYSLOT(sname,stype) class_<_ArraySlotIterator<stype> >("_" sname "_Iterator", init<ArraySlot<stype>&>()) \
.def("__iter__", &_ArraySlotIterator<stype>::__iter__) \
.def("next", &_ArraySlotIterator<stype>::next) \
; \
|
GitWeb
