[incubator-datasketches-cpp] branch python_fi_fix created (now 7b42024)

[jm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a change to branch python_fi_fix
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git.


      at 7b42024  specify copy-merge in python frequent items wrapper to avoid funciton pointer ambiguity

This branch includes the following new commits:

     new 7b42024  specify copy-merge in python frequent items wrapper to avoid funciton pointer ambiguity

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org

[incubator-datasketches-cpp] 01/01: specify copy-merge in python frequent items wrapper to avoid funciton pointer ambiguity

[jm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a commit to branch python_fi_fix
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git

commit 7b42024f49436ebfcb3637e69e549f9de720f9e2
Author: Jon Malkin <jm...@users.noreply.github.com>
AuthorDate: Thu Feb 20 13:37:52 2020 -0800

    specify copy-merge in python frequent items wrapper to avoid funciton pointer ambiguity
---
 python/src/fi_wrapper.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/src/fi_wrapper.cpp b/python/src/fi_wrapper.cpp
index 271ce83..45d7b7f 100644
--- a/python/src/fi_wrapper.cpp
+++ b/python/src/fi_wrapper.cpp
@@ -87,7 +87,7 @@ void bind_fi_sketch(py::module &m, const char* name) {
     .def("to_string", &dspy::fi_sketch_to_string<T>, py::arg("print_items")=false)
     .def("update", (void (frequent_items_sketch<T>::*)(const T&, uint64_t)) &frequent_items_sketch<T>::update, py::arg("item"), py::arg("weight")=1)
     .def("get_frequent_items", &dspy::fi_sketch_get_frequent_items<T>, py::arg("err_type"), py::arg("threshold")=0)
-    .def("merge", &frequent_items_sketch<T>::merge)
+    .def("merge", (void (frequent_items_sketch<T>::*)(const frequent_items_sketch<T>&)) &frequent_items_sketch<T>::merge)
     .def("is_empty", &frequent_items_sketch<T>::is_empty)
     .def("get_num_active_items", &frequent_items_sketch<T>::get_num_active_items)
     .def("get_total_weight", &frequent_items_sketch<T>::get_total_weight)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org