mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-28 04:07:32 -07:00
c1ec4fe569
* EAPI 6 * Call distutils-r1_python_prepare_all * Fix compiling in C++14 mode with GCC 6 Bug: https://bugs.gentoo.org/show_bug.cgi?id=611774 Package-Manager: Portage-2.3.4, Repoman-2.3.2
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
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) \
|
|
; \
|