You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2016/04/14 20:06:05 UTC
svn commit: r1739147 [40/44] - in /qpid/site:
input/releases/qpid-proton-master/
input/releases/qpid-proton-master/proton/c/api/
input/releases/qpid-proton-master/proton/c/api/search/
input/releases/qpid-proton-master/proton/cpp/api/ input/releases/qpi...
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -1,12 +1,14 @@
<h1>helloworld.cpp</h1>
-<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
+<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"proton/connection.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/url.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><iostream></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">class</span> <span class="nc">hello_world</span> <span class="o">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
<span class="k">private</span><span class="o">:</span>
<span class="n">proton</span><span class="o">::</span><span class="n">url</span> <span class="n">url</span><span class="p">;</span>
@@ -14,21 +16,21 @@
<span class="k">public</span><span class="o">:</span>
<span class="n">hello_world</span><span class="p">(</span><span class="k">const</span> <span class="n">proton</span><span class="o">::</span><span class="n">url</span><span class="o">&</span> <span class="n">u</span><span class="p">)</span> <span class="o">:</span> <span class="n">url</span><span class="p">(</span><span class="n">u</span><span class="p">)</span> <span class="p">{}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">connect</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">connect</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
<span class="n">conn</span><span class="p">.</span><span class="n">open_receiver</span><span class="p">(</span><span class="n">url</span><span class="p">.</span><span class="n">path</span><span class="p">());</span>
<span class="n">conn</span><span class="p">.</span><span class="n">open_sender</span><span class="p">(</span><span class="n">url</span><span class="p">.</span><span class="n">path</span><span class="p">());</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_sendable</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_sendable</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">sender</span> <span class="o">&</span><span class="n">s</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="n">m</span><span class="p">(</span><span class="s">"Hello World!"</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">sender</span><span class="p">().</span><span class="n">send</span><span class="p">(</span><span class="n">m</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">sender</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="n">s</span><span class="p">.</span><span class="n">send</span><span class="p">(</span><span class="n">m</span><span class="p">);</span>
+ <span class="n">s</span><span class="p">.</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
- <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="o">&</span><span class="n">m</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+ <span class="n">d</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
<span class="p">};</span>
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp Thu Apr 14 18:05:59 2016
@@ -20,12 +20,16 @@
*/
#include "proton/acceptor.hpp"
+#include "proton/connection.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
+#include "proton/delivery.hpp"
#include "proton/handler.hpp"
+#include "proton/sender.hpp"
#include <iostream>
+#include "fake_cpp11.hpp"
+
class hello_world_direct : public proton::handler {
private:
proton::url url;
@@ -34,26 +38,26 @@ class hello_world_direct : public proton
public:
hello_world_direct(const proton::url& u) : url(u) {}
- void on_start(proton::event &e) {
- acceptor = e.container().listen(url);
- e.container().open_sender(url);
+ void on_container_start(proton::container &c) override {
+ acceptor = c.listen(url);
+ c.open_sender(url);
}
- void on_sendable(proton::event &e) {
+ void on_sendable(proton::sender &s) override {
proton::message m("Hello World!");
- e.sender().send(m);
- e.sender().close();
+ s.send(m);
+ s.close();
}
- void on_message(proton::event &e) {
- std::cout << e.message().body() << std::endl;
+ void on_message(proton::delivery &d, proton::message &m) override {
+ std::cout << m.body() << std::endl;
}
- void on_delivery_accept(proton::event &e) {
- e.connection().close();
+ void on_delivery_accept(proton::delivery &d) override {
+ d.connection().close();
}
- void on_connection_close(proton::event &e) {
+ void on_connection_close(proton::connection &) override {
acceptor.close();
}
};
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -1,12 +1,16 @@
<h1>helloworld_direct.cpp</h1>
<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"proton/acceptor.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/connection.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/delivery.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/sender.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><iostream></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">class</span> <span class="nc">hello_world_direct</span> <span class="o">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
<span class="k">private</span><span class="o">:</span>
<span class="n">proton</span><span class="o">::</span><span class="n">url</span> <span class="n">url</span><span class="p">;</span>
@@ -15,26 +19,26 @@
<span class="k">public</span><span class="o">:</span>
<span class="n">hello_world_direct</span><span class="p">(</span><span class="k">const</span> <span class="n">proton</span><span class="o">::</span><span class="n">url</span><span class="o">&</span> <span class="n">u</span><span class="p">)</span> <span class="o">:</span> <span class="n">url</span><span class="p">(</span><span class="n">u</span><span class="p">)</span> <span class="p">{}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">acceptor</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">listen</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">open_sender</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">acceptor</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">listen</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">open_sender</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_sendable</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_sendable</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">sender</span> <span class="o">&</span><span class="n">s</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="n">m</span><span class="p">(</span><span class="s">"Hello World!"</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">sender</span><span class="p">().</span><span class="n">send</span><span class="p">(</span><span class="n">m</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">sender</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="n">s</span><span class="p">.</span><span class="n">send</span><span class="p">(</span><span class="n">m</span><span class="p">);</span>
+ <span class="n">s</span><span class="p">.</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+ <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="o">&</span><span class="n">m</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_delivery_accept</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="kt">void</span> <span class="n">on_delivery_accept</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">d</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_connection_close</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_connection_close</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="o">&</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">acceptor</span><span class="p">.</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
<span class="p">};</span>
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/index.md
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/index.md?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/index.md (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/index.md Thu Apr 14 18:05:59 2016
@@ -10,6 +10,7 @@
- [direct_recv.cpp](direct_recv.cpp.html)
- [direct_send.cpp](direct_send.cpp.html)
- [encode_decode.cpp](encode_decode.cpp.html)
+ - [fake_cpp11.hpp](fake_cpp11.hpp.html)
- [helloworld.cpp](helloworld.cpp.html)
- [helloworld_direct.cpp](helloworld_direct.cpp.html)
- [options.hpp](options.hpp.html)
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp Thu Apr 14 18:05:59 2016
@@ -19,14 +19,16 @@
*
*/
+#include "proton/connection.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
#include "proton/handler.hpp"
#include "proton/url.hpp"
#include "proton/link_options.hpp"
#include <iostream>
+#include "fake_cpp11.hpp"
+
class browser : public proton::handler {
private:
proton::url url;
@@ -34,16 +36,16 @@ class browser : public proton::handler {
public:
browser(const proton::url& u) : url(u) {}
- void on_start(proton::event &e) {
- proton::connection conn = e.container().connect(url);
+ void on_container_start(proton::container &c) override {
+ proton::connection conn = c.connect(url);
conn.open_receiver(url.path(), proton::link_options().browsing(true));
}
- void on_message(proton::event &e) {
- std::cout << e.message().body() << std::endl;
+ void on_message(proton::delivery &d, proton::message &m) override {
+ std::cout << m.body() << std::endl;
- if (e.receiver().queued() == 0 && e.receiver().drained() > 0) {
- e.connection().close();
+ if (d.link().queued() == 0 && d.link().drained() > 0) {
+ d.connection().close();
}
}
};
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -1,13 +1,15 @@
<h1>queue_browser.cpp</h1>
-<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
+<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"proton/connection.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/url.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/link_options.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><iostream></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">class</span> <span class="nc">browser</span> <span class="o">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
<span class="k">private</span><span class="o">:</span>
<span class="n">proton</span><span class="o">::</span><span class="n">url</span> <span class="n">url</span><span class="p">;</span>
@@ -15,16 +17,16 @@
<span class="k">public</span><span class="o">:</span>
<span class="n">browser</span><span class="p">(</span><span class="k">const</span> <span class="n">proton</span><span class="o">::</span><span class="n">url</span><span class="o">&</span> <span class="n">u</span><span class="p">)</span> <span class="o">:</span> <span class="n">url</span><span class="p">(</span><span class="n">u</span><span class="p">)</span> <span class="p">{}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">connect</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">connect</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
<span class="n">conn</span><span class="p">.</span><span class="n">open_receiver</span><span class="p">(</span><span class="n">url</span><span class="p">.</span><span class="n">path</span><span class="p">(),</span> <span class="n">proton</span><span class="o">::</span><span class="n">link_options</span><span class="p">().</span><span class="n">browsing</span><span class="p">(</span><span class="nb">true</span><span class="p">));</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+ <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="o">&</span><span class="n">m</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
- <span class="k">if</span> <span class="p">(</span><span class="n">e</span><span class="p">.</span><span class="n">receiver</span><span class="p">().</span><span class="n">queued</span><span class="p">()</span> <span class="o">==</span> <span class="mi">0</span> <span class="o">&&</span> <span class="n">e</span><span class="p">.</span><span class="n">receiver</span><span class="p">().</span><span class="n">drained</span><span class="p">()</span> <span class="o">></span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="k">if</span> <span class="p">(</span><span class="n">d</span><span class="p">.</span><span class="n">link</span><span class="p">().</span><span class="n">queued</span><span class="p">()</span> <span class="o">==</span> <span class="mi">0</span> <span class="o">&&</span> <span class="n">d</span><span class="p">.</span><span class="n">link</span><span class="p">().</span><span class="n">drained</span><span class="p">()</span> <span class="o">></span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
+ <span class="n">d</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">};</span>
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp Thu Apr 14 18:05:59 2016
@@ -22,21 +22,22 @@
#include "options.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
#include "proton/handler.hpp"
#include "proton/task.hpp"
#include <iostream>
#include <map>
+#include "fake_cpp11.hpp"
+
class ticker : public proton::handler {
- void on_timer(proton::event &e) {
+ void on_timer(proton::container &) override {
std::cout << "Tick..." << std::endl;
}
};
class tocker : public proton::handler {
- void on_timer(proton::event &e) {
+ void on_timer(proton::container &) override {
std::cout << "Tock..." << std::endl;
}
};
@@ -52,28 +53,28 @@ class recurring : public proton::handler
recurring(int msecs, int tickms) : remaining_msecs(msecs), tick_ms(tickms), cancel_task(0) {}
- proton::task ticktock(proton::event &e) {
+ proton::task ticktock(proton::container &c) {
// Show timer events in separate handlers.
- e.container().schedule(tick_ms, &tick_handler);
- return e.container().schedule(tick_ms * 3, &tock_handler);
+ c.schedule(tick_ms, &tick_handler);
+ return c.schedule(tick_ms * 3, &tock_handler);
}
- void on_start(proton::event &e) {
+ void on_container_start(proton::container &c) override {
// Demonstrate cancel(), we will cancel the first tock on the first recurring::on_timer_task
- cancel_task = ticktock(e);
- e.container().schedule(0);
+ cancel_task = ticktock(c);
+ c.schedule(0);
}
- void on_timer(proton::event &e) {
+ void on_timer(proton::container &c) override {
if (!!cancel_task) {
cancel_task.cancel();
cancel_task = 0;
- e.container().schedule(tick_ms * 4);
+ c.schedule(tick_ms * 4);
} else {
remaining_msecs -= tick_ms * 4;
if (remaining_msecs > 0) {
- ticktock(e);
- e.container().schedule(tick_ms * 4);
+ ticktock(c);
+ c.schedule(tick_ms * 4);
}
}
}
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -3,21 +3,22 @@
<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"options.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/task.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><iostream></span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><map></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">class</span> <span class="nc">ticker</span> <span class="o">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
- <span class="kt">void</span> <span class="n">on_timer</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_timer</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Tick..."</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
<span class="p">};</span>
<span class="k">class</span> <span class="nc">tocker</span> <span class="o">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
- <span class="kt">void</span> <span class="n">on_timer</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_timer</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Tock..."</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
<span class="p">};</span>
@@ -33,28 +34,28 @@
<span class="n">recurring</span><span class="p">(</span><span class="kt">int</span> <span class="n">msecs</span><span class="p">,</span> <span class="kt">int</span> <span class="n">tickms</span><span class="p">)</span> <span class="o">:</span> <span class="n">remaining_msecs</span><span class="p">(</span><span class="n">msecs</span><span class="p">),</span> <span class="n">tick_ms</span><span class="p">(</span><span class="n">tickms</span><span class="p">),</span> <span class="n">cancel_task</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span> <span class="p">{}</span>
- <span class="n">proton</span><span class="o">::</span><span class="n">task</span> <span class="n">ticktock</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="n">proton</span><span class="o">::</span><span class="n">task</span> <span class="n">ticktock</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="p">{</span>
<span class="c1">// Show timer events in separate handlers.</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">schedule</span><span class="p">(</span><span class="n">tick_ms</span><span class="p">,</span> <span class="o">&</span><span class="n">tick_handler</span><span class="p">);</span>
- <span class="k">return</span> <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">schedule</span><span class="p">(</span><span class="n">tick_ms</span> <span class="o">*</span> <span class="mi">3</span><span class="p">,</span> <span class="o">&</span><span class="n">tock_handler</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">schedule</span><span class="p">(</span><span class="n">tick_ms</span><span class="p">,</span> <span class="o">&</span><span class="n">tick_handler</span><span class="p">);</span>
+ <span class="k">return</span> <span class="n">c</span><span class="p">.</span><span class="n">schedule</span><span class="p">(</span><span class="n">tick_ms</span> <span class="o">*</span> <span class="mi">3</span><span class="p">,</span> <span class="o">&</span><span class="n">tock_handler</span><span class="p">);</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="c1">// Demonstrate cancel(), we will cancel the first tock on the first recurring::on_timer_task</span>
- <span class="n">cancel_task</span> <span class="o">=</span> <span class="n">ticktock</span><span class="p">(</span><span class="n">e</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">schedule</span><span class="p">(</span><span class="mi">0</span><span class="p">);</span>
+ <span class="n">cancel_task</span> <span class="o">=</span> <span class="n">ticktock</span><span class="p">(</span><span class="n">c</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">schedule</span><span class="p">(</span><span class="mi">0</span><span class="p">);</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_timer</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_timer</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="k">if</span> <span class="p">(</span><span class="o">!!</span><span class="n">cancel_task</span><span class="p">)</span> <span class="p">{</span>
<span class="n">cancel_task</span><span class="p">.</span><span class="n">cancel</span><span class="p">();</span>
<span class="n">cancel_task</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">schedule</span><span class="p">(</span><span class="n">tick_ms</span> <span class="o">*</span> <span class="mi">4</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">schedule</span><span class="p">(</span><span class="n">tick_ms</span> <span class="o">*</span> <span class="mi">4</span><span class="p">);</span>
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
<span class="n">remaining_msecs</span> <span class="o">-=</span> <span class="n">tick_ms</span> <span class="o">*</span> <span class="mi">4</span><span class="p">;</span>
<span class="k">if</span> <span class="p">(</span><span class="n">remaining_msecs</span> <span class="o">></span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">ticktock</span><span class="p">(</span><span class="n">e</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">schedule</span><span class="p">(</span><span class="n">tick_ms</span> <span class="o">*</span> <span class="mi">4</span><span class="p">);</span>
+ <span class="n">ticktock</span><span class="p">(</span><span class="n">c</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">schedule</span><span class="p">(</span><span class="n">tick_ms</span> <span class="o">*</span> <span class="mi">4</span><span class="p">);</span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">}</span>
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp Thu Apr 14 18:05:59 2016
@@ -19,14 +19,16 @@
*
*/
+#include "proton/connection.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
#include "proton/handler.hpp"
#include "proton/url.hpp"
#include "proton/link_options.hpp"
#include <iostream>
+#include "fake_cpp11.hpp"
+
class selected_recv : public proton::handler {
private:
proton::url url;
@@ -34,13 +36,13 @@ class selected_recv : public proton::han
public:
selected_recv(const proton::url& u) : url(u) {}
- void on_start(proton::event &e) {
- proton::connection conn = e.container().connect(url);
+ void on_container_start(proton::container &c) override {
+ proton::connection conn = c.connect(url);
conn.open_receiver(url.path(), proton::link_options().selector("colour = 'green'"));
}
- void on_message(proton::event &e) {
- std::cout << e.message().body() << std::endl;
+ void on_message(proton::delivery &d, proton::message &m) override {
+ std::cout << m.body() << std::endl;
}
};
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -1,13 +1,15 @@
<h1>selected_recv.cpp</h1>
-<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
+<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"proton/connection.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/url.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/link_options.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><iostream></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">class</span> <span class="nc">selected_recv</span> <span class="o">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
<span class="k">private</span><span class="o">:</span>
<span class="n">proton</span><span class="o">::</span><span class="n">url</span> <span class="n">url</span><span class="p">;</span>
@@ -15,13 +17,13 @@
<span class="k">public</span><span class="o">:</span>
<span class="n">selected_recv</span><span class="p">(</span><span class="k">const</span> <span class="n">proton</span><span class="o">::</span><span class="n">url</span><span class="o">&</span> <span class="n">u</span><span class="p">)</span> <span class="o">:</span> <span class="n">url</span><span class="p">(</span><span class="n">u</span><span class="p">)</span> <span class="p">{}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">connect</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="n">conn</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">connect</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
<span class="n">conn</span><span class="p">.</span><span class="n">open_receiver</span><span class="p">(</span><span class="n">url</span><span class="p">.</span><span class="n">path</span><span class="p">(),</span> <span class="n">proton</span><span class="o">::</span><span class="n">link_options</span><span class="p">().</span><span class="n">selector</span><span class="p">(</span><span class="s">"colour = 'green'"</span><span class="p">));</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+ <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="o">&</span><span class="n">m</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
<span class="p">};</span>
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server.cpp
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server.cpp?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server.cpp (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server.cpp Thu Apr 14 18:05:59 2016
@@ -23,7 +23,6 @@
#include "proton/connection.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
#include "proton/handler.hpp"
#include "proton/url.hpp"
@@ -32,6 +31,8 @@
#include <string>
#include <cctype>
+#include "fake_cpp11.hpp"
+
class server : public proton::handler {
private:
typedef std::map<std::string, proton::sender> sender_map;
@@ -42,8 +43,8 @@ class server : public proton::handler {
public:
server(const std::string &u) : url(u) {}
- void on_start(proton::event &e) {
- connection = e.container().connect(url);
+ void on_container_start(proton::container &c) override {
+ connection = c.connect(url);
connection.open_receiver(url.path());
std::cout << "server connected to " << url << std::endl;
@@ -58,15 +59,15 @@ class server : public proton::handler {
return uc;
}
- void on_message(proton::event &e) {
- std::cout << "Received " << e.message().body() << std::endl;
+ void on_message(proton::delivery &d, proton::message &m) override {
+ std::cout << "Received " << m.body() << std::endl;
- std::string reply_to = e.message().reply_to();
+ std::string reply_to = m.reply_to();
proton::message reply;
reply.address(reply_to);
- reply.body(to_upper(e.message().body().get<std::string>()));
- reply.correlation_id(e.message().correlation_id());
+ reply.body(to_upper(proton::get<std::string>(m.body())));
+ reply.correlation_id(m.correlation_id());
if (!senders[reply_to]) {
senders[reply_to] = connection.open_sender(reply_to);
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -4,7 +4,6 @@
<span class="cp">#include</span> <span class="cpf">"proton/connection.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/url.hpp"</span><span class="cp"></span>
@@ -13,6 +12,8 @@
<span class="cp">#include</span> <span class="cpf"><string></span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><cctype></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">class</span> <span class="nc">server</span> <span class="o">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
<span class="k">private</span><span class="o">:</span>
<span class="k">typedef</span> <span class="n">std</span><span class="o">::</span><span class="n">map</span><span class="o"><</span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">sender</span><span class="o">></span> <span class="n">sender_map</span><span class="p">;</span>
@@ -23,8 +24,8 @@
<span class="k">public</span><span class="o">:</span>
<span class="n">server</span><span class="p">(</span><span class="k">const</span> <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="o">&</span><span class="n">u</span><span class="p">)</span> <span class="o">:</span> <span class="n">url</span><span class="p">(</span><span class="n">u</span><span class="p">)</span> <span class="p">{}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">connection</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">connect</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">connection</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">connect</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
<span class="n">connection</span><span class="p">.</span><span class="n">open_receiver</span><span class="p">(</span><span class="n">url</span><span class="p">.</span><span class="n">path</span><span class="p">());</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"server connected to "</span> <span class="o"><<</span> <span class="n">url</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
@@ -39,15 +40,15 @@
<span class="k">return</span> <span class="n">uc</span><span class="p">;</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Received "</span> <span class="o"><<</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+ <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="o">&</span><span class="n">m</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Received "</span> <span class="o"><<</span> <span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
- <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">reply_to</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">reply_to</span><span class="p">();</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">reply_to</span> <span class="o">=</span> <span class="n">m</span><span class="p">.</span><span class="n">reply_to</span><span class="p">();</span>
<span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="n">reply</span><span class="p">;</span>
<span class="n">reply</span><span class="p">.</span><span class="n">address</span><span class="p">(</span><span class="n">reply_to</span><span class="p">);</span>
- <span class="n">reply</span><span class="p">.</span><span class="n">body</span><span class="p">(</span><span class="n">to_upper</span><span class="p">(</span><span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">body</span><span class="p">().</span><span class="n">get</span><span class="o"><</span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">></span><span class="p">()));</span>
- <span class="n">reply</span><span class="p">.</span><span class="n">correlation_id</span><span class="p">(</span><span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">correlation_id</span><span class="p">());</span>
+ <span class="n">reply</span><span class="p">.</span><span class="n">body</span><span class="p">(</span><span class="n">to_upper</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">get</span><span class="o"><</span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">></span><span class="p">(</span><span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">())));</span>
+ <span class="n">reply</span><span class="p">.</span><span class="n">correlation_id</span><span class="p">(</span><span class="n">m</span><span class="p">.</span><span class="n">correlation_id</span><span class="p">());</span>
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">senders</span><span class="p">[</span><span class="n">reply_to</span><span class="p">])</span> <span class="p">{</span>
<span class="n">senders</span><span class="p">[</span><span class="n">reply_to</span><span class="p">]</span> <span class="o">=</span> <span class="n">connection</span><span class="p">.</span><span class="n">open_sender</span><span class="p">(</span><span class="n">reply_to</span><span class="p">);</span>
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp Thu Apr 14 18:05:59 2016
@@ -23,8 +23,8 @@
#include "proton/acceptor.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
#include "proton/handler.hpp"
+#include "proton/sender.hpp"
#include "proton/url.hpp"
#include <iostream>
@@ -33,6 +33,8 @@
#include <sstream>
#include <cctype>
+#include "fake_cpp11.hpp"
+
class server : public proton::handler {
private:
typedef std::map<std::string, proton::sender> sender_map;
@@ -43,8 +45,8 @@ class server : public proton::handler {
public:
server(const std::string &u) : url(u), address_counter(0) {}
- void on_start(proton::event &e) {
- e.container().listen(url);
+ void on_container_start(proton::container &c) override {
+ c.listen(url);
std::cout << "server listening on " << url << std::endl;
}
@@ -64,30 +66,28 @@ class server : public proton::handler {
return addr.str();
}
- void on_link_open(proton::event& e) {
- proton::link link = e.link();
-
- if (!!link.sender() && link.remote_source().dynamic()) {
- link.local_source().address(generate_address());
- senders[link.local_source().address()] = link.sender();
+ void on_sender_open(proton::sender &sender) override {
+ if (sender.remote_source().dynamic()) {
+ sender.local_source().address(generate_address());
+ senders[sender.local_source().address()] = sender;
}
}
- void on_message(proton::event &e) {
- std::cout << "Received " << e.message().body() << std::endl;
-
- std::string reply_to = e.message().reply_to();
+ void on_message(proton::delivery &d, proton::message &m) override {
+ std::cout << "Received " << m.body() << std::endl;
+
+ std::string reply_to = m.reply_to();
sender_map::iterator it = senders.find(reply_to);
-
+
if (it == senders.end()) {
std::cout << "No link for reply_to: " << reply_to << std::endl;
} else {
proton::sender sender = it->second;
proton::message reply;
-
+
reply.address(reply_to);
- reply.body(to_upper(e.message().body().get<std::string>()));
- reply.correlation_id(e.message().correlation_id());
+ reply.body(to_upper(proton::get<std::string>(m.body())));
+ reply.correlation_id(m.correlation_id());
sender.send(reply);
}
@@ -102,7 +102,7 @@ int main(int argc, char **argv) {
try {
opts.parse();
-
+
server srv(address);
proton::container(srv).run();
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -4,8 +4,8 @@
<span class="cp">#include</span> <span class="cpf">"proton/acceptor.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/sender.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/url.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><iostream></span><span class="cp"></span>
@@ -14,6 +14,8 @@
<span class="cp">#include</span> <span class="cpf"><sstream></span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><cctype></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">class</span> <span class="nc">server</span> <span class="o">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
<span class="k">private</span><span class="o">:</span>
<span class="k">typedef</span> <span class="n">std</span><span class="o">::</span><span class="n">map</span><span class="o"><</span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">sender</span><span class="o">></span> <span class="n">sender_map</span><span class="p">;</span>
@@ -24,8 +26,8 @@
<span class="k">public</span><span class="o">:</span>
<span class="n">server</span><span class="p">(</span><span class="k">const</span> <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="o">&</span><span class="n">u</span><span class="p">)</span> <span class="o">:</span> <span class="n">url</span><span class="p">(</span><span class="n">u</span><span class="p">),</span> <span class="n">address_counter</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span> <span class="p">{}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">listen</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">listen</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"server listening on "</span> <span class="o"><<</span> <span class="n">url</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
@@ -45,30 +47,28 @@
<span class="k">return</span> <span class="n">addr</span><span class="p">.</span><span class="n">str</span><span class="p">();</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_link_open</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span><span class="o">&</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">proton</span><span class="o">::</span><span class="n">link</span> <span class="n">link</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">link</span><span class="p">();</span>
-
- <span class="k">if</span> <span class="p">(</span><span class="o">!!</span><span class="n">link</span><span class="p">.</span><span class="n">sender</span><span class="p">()</span> <span class="o">&&</span> <span class="n">link</span><span class="p">.</span><span class="n">remote_source</span><span class="p">().</span><span class="n">dynamic</span><span class="p">())</span> <span class="p">{</span>
- <span class="n">link</span><span class="p">.</span><span class="n">local_source</span><span class="p">().</span><span class="n">address</span><span class="p">(</span><span class="n">generate_address</span><span class="p">());</span>
- <span class="n">senders</span><span class="p">[</span><span class="n">link</span><span class="p">.</span><span class="n">local_source</span><span class="p">().</span><span class="n">address</span><span class="p">()]</span> <span class="o">=</span> <span class="n">link</span><span class="p">.</span><span class="n">sender</span><span class="p">();</span>
+ <span class="kt">void</span> <span class="n">on_sender_open</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">sender</span> <span class="o">&</span><span class="n">sender</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="k">if</span> <span class="p">(</span><span class="n">sender</span><span class="p">.</span><span class="n">remote_source</span><span class="p">().</span><span class="n">dynamic</span><span class="p">())</span> <span class="p">{</span>
+ <span class="n">sender</span><span class="p">.</span><span class="n">local_source</span><span class="p">().</span><span class="n">address</span><span class="p">(</span><span class="n">generate_address</span><span class="p">());</span>
+ <span class="n">senders</span><span class="p">[</span><span class="n">sender</span><span class="p">.</span><span class="n">local_source</span><span class="p">().</span><span class="n">address</span><span class="p">()]</span> <span class="o">=</span> <span class="n">sender</span><span class="p">;</span>
<span class="p">}</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Received "</span> <span class="o"><<</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
-
- <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">reply_to</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">reply_to</span><span class="p">();</span>
+ <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="o">&</span><span class="n">m</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Received "</span> <span class="o"><<</span> <span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+
+ <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">reply_to</span> <span class="o">=</span> <span class="n">m</span><span class="p">.</span><span class="n">reply_to</span><span class="p">();</span>
<span class="n">sender_map</span><span class="o">::</span><span class="n">iterator</span> <span class="n">it</span> <span class="o">=</span> <span class="n">senders</span><span class="p">.</span><span class="n">find</span><span class="p">(</span><span class="n">reply_to</span><span class="p">);</span>
-
+
<span class="k">if</span> <span class="p">(</span><span class="n">it</span> <span class="o">==</span> <span class="n">senders</span><span class="p">.</span><span class="n">end</span><span class="p">())</span> <span class="p">{</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"No link for reply_to: "</span> <span class="o"><<</span> <span class="n">reply_to</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
<span class="n">proton</span><span class="o">::</span><span class="n">sender</span> <span class="n">sender</span> <span class="o">=</span> <span class="n">it</span><span class="o">-></span><span class="n">second</span><span class="p">;</span>
<span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="n">reply</span><span class="p">;</span>
-
+
<span class="n">reply</span><span class="p">.</span><span class="n">address</span><span class="p">(</span><span class="n">reply_to</span><span class="p">);</span>
- <span class="n">reply</span><span class="p">.</span><span class="n">body</span><span class="p">(</span><span class="n">to_upper</span><span class="p">(</span><span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">body</span><span class="p">().</span><span class="n">get</span><span class="o"><</span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">></span><span class="p">()));</span>
- <span class="n">reply</span><span class="p">.</span><span class="n">correlation_id</span><span class="p">(</span><span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">correlation_id</span><span class="p">());</span>
+ <span class="n">reply</span><span class="p">.</span><span class="n">body</span><span class="p">(</span><span class="n">to_upper</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">get</span><span class="o"><</span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">></span><span class="p">(</span><span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">())));</span>
+ <span class="n">reply</span><span class="p">.</span><span class="n">correlation_id</span><span class="p">(</span><span class="n">m</span><span class="p">.</span><span class="n">correlation_id</span><span class="p">());</span>
<span class="n">sender</span><span class="p">.</span><span class="n">send</span><span class="p">(</span><span class="n">reply</span><span class="p">);</span>
<span class="p">}</span>
@@ -83,7 +83,7 @@
<span class="k">try</span> <span class="p">{</span>
<span class="n">opts</span><span class="p">.</span><span class="n">parse</span><span class="p">();</span>
-
+
<span class="n">server</span> <span class="n">srv</span><span class="p">(</span><span class="n">address</span><span class="p">);</span>
<span class="n">proton</span><span class="o">::</span><span class="n">container</span><span class="p">(</span><span class="n">srv</span><span class="p">).</span><span class="n">run</span><span class="p">();</span>
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_recv.cpp
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_recv.cpp?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_recv.cpp (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_recv.cpp Thu Apr 14 18:05:59 2016
@@ -21,16 +21,19 @@
#include "options.hpp"
+#include "proton/connection.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
+#include "proton/delivery.hpp"
#include "proton/handler.hpp"
#include "proton/link.hpp"
-#include "proton/value.hpp"
#include "proton/message_id.hpp"
+#include "proton/value.hpp"
#include <iostream>
#include <map>
+#include "fake_cpp11.hpp"
+
class simple_recv : public proton::handler {
private:
proton::url url;
@@ -41,25 +44,23 @@ class simple_recv : public proton::handl
public:
simple_recv(const std::string &s, int c) : url(s), expected(c), received(0) {}
- void on_start(proton::event &e) {
- receiver = e.container().open_receiver(url);
+ void on_container_start(proton::container &c) override {
+ receiver = c.open_receiver(url);
std::cout << "simple_recv listening on " << url << std::endl;
}
- void on_message(proton::event &e) {
- proton::message& msg = e.message();
-
+ void on_message(proton::delivery &d, proton::message &msg) override {
if (msg.id().get<uint64_t>() < received) {
return; // Ignore duplicate
}
-
+
if (expected == 0 || received < expected) {
std::cout << msg.body() << std::endl;
received++;
-
+
if (received == expected) {
- e.receiver().close();
- e.connection().close();
+ d.link().close();
+ d.connection().close();
}
}
}
@@ -67,7 +68,7 @@ class simple_recv : public proton::handl
int main(int argc, char **argv) {
std::string address("127.0.0.1:5672/examples");
-
+
int message_count = 100;
options opts(argc, argv);
@@ -76,7 +77,7 @@ int main(int argc, char **argv) {
try {
opts.parse();
-
+
simple_recv recv(address, message_count);
proton::container(recv).run();
@@ -86,6 +87,6 @@ int main(int argc, char **argv) {
} catch (const std::exception& e) {
std::cerr << e.what() << std::endl;
}
-
+
return 1;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org