You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/dev-python/cgkit/files/cgkit-2.0.0-fix-c++14.patch

34 lines
1.2 KiB

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) \
; \