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::onValueChanged, &SlotWrapper::base_onValueChanged) // This macro can be used to create a new Python array slot type -#define ARRAYSLOT(sname,stype) class_<_ArraySlotIterator >("_"sname"_Iterator", init&>()) \ +#define ARRAYSLOT(sname,stype) class_<_ArraySlotIterator >("_" sname "_Iterator", init&>()) \ .def("__iter__", &_ArraySlotIterator::__iter__) \ .def("next", &_ArraySlotIterator::next) \ ; \