Skip to content

Commit

Permalink
remove pair functions
Browse files Browse the repository at this point in the history
  • Loading branch information
gagelarsen authored and Tsubashi committed Sep 14, 2018
1 parent a792603 commit ea3c8b7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
8 changes: 6 additions & 2 deletions xmscore/python/misc/PyUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,10 @@ py::iterable PyIterFromDynamicBitset(const DynBitset& bitset, bool numpy)
return py::array(vec_bools.size(), vec_bools.data());
}
} // PyIterFromDynamicBitset
/*
// These functions were causing compiler problems...
//------------------------------------------------------------------------------
/// \brief Create std::pair<int, int> from py::iterable
/// \param[in] pt: py::iterable object that represents a std::pair<int, int>
Expand Down Expand Up @@ -376,5 +380,5 @@ py::iterable PyIterFromVecIntPair(const std::vector<std::pair<int, int>>& intpai
}
return tuple_ret;
} // PyIterFromVecIntPair

} // namespace xms
*/
} // namespace xms
10 changes: 5 additions & 5 deletions xmscore/python/misc/PyUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ py::iterable PyIterFromVecFlt(const VecFlt& flts, bool numpy=false);
DynBitset DynamicBitsetFromPyIter(const py::iterable& bitset);
py::iterable PyIterFromDynamicBitset(const DynBitset& bitset);

std::pair<int, int> IntPairFromPyIter(const py::iterable& intpair);
py::iterable PyIterFromIntPair(const std::pair<int, int>& intpair);
// std::pair<int, int> IntPairFromPyIter(const py::iterable& intpair);
// py::iterable PyIterFromIntPair(const std::pair<int, int>& intpair);

boost::shared_ptr<std::vector<std::pair<int, int>>> VecIntPairFromPyIter(const py::iterable& intpairs);
py::iterable PyIterFromVecIntPair(const std::vector<std::pair<int, int>>& intpairs);
// boost::shared_ptr<std::vector<std::pair<int, int>>> VecIntPairFromPyIter(const py::iterable& intpairs);
// py::iterable PyIterFromVecIntPair(const std::vector<std::pair<int, int>>& intpairs);

}
}

0 comments on commit ea3c8b7

Please sign in to comment.