Repository: qpid-proton Updated Branches: refs/heads/go1 3d8368b2e -> 14f7ca56f
PROTON-1527: [C++ binding] Older wersions of VS don't allow std::bind to ignore a return value Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/ad665d25 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/ad665d25 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/ad665d25 Branch: refs/heads/go1 Commit: ad665d252a7054971e2b4935fe8b1c1b7c30cef5 Parents: 02b85ea Author: Andrew Stitcher <astitc...@apache.org> Authored: Tue Oct 10 16:24:18 2017 -0400 Committer: Andrew Stitcher <astitc...@apache.org> Committed: Tue Oct 10 16:24:18 2017 -0400 ---------------------------------------------------------------------- proton-c/bindings/cpp/src/include/proactor_work_queue_impl.hpp | 1 + proton-c/bindings/cpp/src/proactor_container_impl.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ad665d25/proton-c/bindings/cpp/src/include/proactor_work_queue_impl.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/include/proactor_work_queue_impl.hpp b/proton-c/bindings/cpp/src/include/proactor_work_queue_impl.hpp index 1c94254..cd9037a 100644 --- a/proton-c/bindings/cpp/src/include/proactor_work_queue_impl.hpp +++ b/proton-c/bindings/cpp/src/include/proactor_work_queue_impl.hpp @@ -30,6 +30,7 @@ class work_queue::impl { public: virtual ~impl() {}; virtual bool add(work f) = 0; + void add_void(work f) { add(f); } virtual void schedule(duration, work) = 0; virtual void run_all_jobs() = 0; virtual void finished() = 0; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ad665d25/proton-c/bindings/cpp/src/proactor_container_impl.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/proactor_container_impl.cpp b/proton-c/bindings/cpp/src/proactor_container_impl.cpp index 30940ff..64c0f78 100644 --- a/proton-c/bindings/cpp/src/proactor_container_impl.cpp +++ b/proton-c/bindings/cpp/src/proactor_container_impl.cpp @@ -77,7 +77,7 @@ void container::impl::common_work_queue::schedule(duration d, work f) { // Note this is an unbounded work queue. // A resource-safe implementation should be bounded. if (finished_) return; - container_.schedule(d, make_work(&work_queue::impl::add, (work_queue::impl*)this, f)); + container_.schedule(d, make_work(&work_queue::impl::add_void, (work_queue::impl*)this, f)); } void container::impl::common_work_queue::run_all_jobs() { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
