Repository: qpid-proton Updated Branches: refs/heads/master 36b64f73f -> f5619f555
NO-JIRA: minor examples fix - consistent "examples" node name in C Some of the C examples were using "example" (no 's'), made them consistent Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/f5619f55 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/f5619f55 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/f5619f55 Branch: refs/heads/master Commit: f5619f5557da915dbb8d36a5fa6a596c0d956db6 Parents: 36b64f7 Author: Alan Conway <acon...@redhat.com> Authored: Tue Aug 22 17:20:22 2017 -0400 Committer: Alan Conway <acon...@redhat.com> Committed: Tue Aug 22 17:20:22 2017 -0400 ---------------------------------------------------------------------- examples/c/proactor/README.dox | 2 +- examples/c/proactor/direct.c | 2 +- examples/c/proactor/receive.c | 2 +- examples/c/proactor/send.c | 2 +- examples/cpp/broker.cpp | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f5619f55/examples/c/proactor/README.dox ---------------------------------------------------------------------- diff --git a/examples/c/proactor/README.dox b/examples/c/proactor/README.dox index 3950a9a..a548d35 100644 --- a/examples/c/proactor/README.dox +++ b/examples/c/proactor/README.dox @@ -1,7 +1,7 @@ /** * @example send.c * - * Send a fixed number of messages to the "example" node. + * Send a fixed number of messages to the "examples" node. * Can be used with @ref broker.c, @ref direct.c or an external AMQP broker. * * @example receive.c http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f5619f55/examples/c/proactor/direct.c ---------------------------------------------------------------------- diff --git a/examples/c/proactor/direct.c b/examples/c/proactor/direct.c index c1ac467..15550e6 100644 --- a/examples/c/proactor/direct.c +++ b/examples/c/proactor/direct.c @@ -310,7 +310,7 @@ int main(int argc, char **argv) { app.container_id = argv[i++]; /* Should be unique */ app.host = (argc > 1) ? argv[i++] : ""; app.port = (argc > 1) ? argv[i++] : "amqp"; - app.amqp_address = (argc > i) ? argv[i++] : "example"; + app.amqp_address = (argc > i) ? argv[i++] : "examples"; app.message_count = (argc > i) ? atoi(argv[i++]) : 10; /* Create the proactor and connect */ http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f5619f55/examples/c/proactor/receive.c ---------------------------------------------------------------------- diff --git a/examples/c/proactor/receive.c b/examples/c/proactor/receive.c index 1b9e3f9..6fd74a5 100644 --- a/examples/c/proactor/receive.c +++ b/examples/c/proactor/receive.c @@ -174,7 +174,7 @@ int main(int argc, char **argv) { app.container_id = argv[i++]; /* Should be unique */ app.host = (argc > 1) ? argv[i++] : ""; app.port = (argc > 1) ? argv[i++] : "amqp"; - app.amqp_address = (argc > i) ? argv[i++] : "example"; + app.amqp_address = (argc > i) ? argv[i++] : "examples"; app.message_count = (argc > i) ? atoi(argv[i++]) : 10; /* Create the proactor and connect */ http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f5619f55/examples/c/proactor/send.c ---------------------------------------------------------------------- diff --git a/examples/c/proactor/send.c b/examples/c/proactor/send.c index 3324010..43da8b0 100644 --- a/examples/c/proactor/send.c +++ b/examples/c/proactor/send.c @@ -182,7 +182,7 @@ int main(int argc, char **argv) { app.container_id = argv[i++]; /* Should be unique */ app.host = (argc > 1) ? argv[i++] : ""; app.port = (argc > 1) ? argv[i++] : "amqp"; - app.amqp_address = (argc > i) ? argv[i++] : "example"; + app.amqp_address = (argc > i) ? argv[i++] : "examples"; app.message_count = (argc > i) ? atoi(argv[i++]) : 10; app.proactor = pn_proactor(); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f5619f55/examples/cpp/broker.cpp ---------------------------------------------------------------------- diff --git a/examples/cpp/broker.cpp b/examples/cpp/broker.cpp index 01dab36..198b449 100644 --- a/examples/cpp/broker.cpp +++ b/examples/cpp/broker.cpp @@ -128,6 +128,7 @@ class Queue { proton::work_queue work_queue_; const std::string name_; std::deque<proton::message> messages_; + // FIXME aconway 2017-08-22: thread unsafe Sender* typedef std::map<Sender*, int> subscriptions; // With credit subscriptions subscriptions_; subscriptions::iterator current_; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
