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:29:38 UTC
svn commit: r1739159 [41/45] - in
/qpid/site/docs/releases/qpid-proton-master: ./ proton/c/api/
proton/c/api/search/ proton/cpp/api/ proton/cpp/api/search/
proton/cpp/examples/ proton/java/api/
proton/java/api/org/apache/qpid/proton/engine/ proton/java...
Added: qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/fake_cpp11.hpp.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/fake_cpp11.hpp.html?rev=1739159&view=auto
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/fake_cpp11.hpp.html (added)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/fake_cpp11.hpp.html Thu Apr 14 18:29:35 2016
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements. See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership. The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License. You may obtain a copy of the License at
+ -
+ - http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied. See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+ <head>
+ <title>fake_cpp11.hpp - Apache Qpid™</title>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
+ <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
+ <script type="text/javascript">var _deferredFunctions = [];</script>
+ <script type="text/javascript" src="/deferred.js" defer="defer"></script>
+ <!--[if lte IE 8]>
+ <link rel="stylesheet" href="/ie.css" type="text/css"/>
+ <script type="text/javascript" src="/html5shiv.js"></script>
+ <![endif]-->
+
+ <!-- Redirects for `go get` and godoc.org -->
+ <meta name="go-import"
+ content="qpid.apache.org git https://git-wip-us.apache.org/repos/asf/qpid-proton.git"/>
+ <meta name="go-source"
+ content="qpid.apache.org
+https://github.com/apache/qpid-proton/blob/go1/README.md
+https://github.com/apache/qpid-proton/tree/go1{/dir}
+https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
+ </head>
+ <body>
+ <div id="-content">
+ <div id="-top" class="panel">
+ <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
+
+ <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
+
+ <ul id="-global-navigation">
+ <li><a id="-logotype" href="/index.html">Apache Qpid<sup>™</sup></a></li>
+ <li><a href="/documentation.html">Documentation</a></li>
+ <li><a href="/download.html">Download</a></li>
+ <li><a href="/discussion.html">Discussion</a></li>
+ </ul>
+ </div>
+
+ <div id="-menu" class="panel" style="display: none;">
+ <div class="flex">
+ <section>
+ <h3>Project</h3>
+
+ <ul>
+ <li><a href="/overview.html">Overview</a></li>
+ <li><a href="/components/index.html">Components</a></li>
+ <li><a href="/releases/index.html">Releases</a></li>
+ </ul>
+ </section>
+
+ <section>
+ <h3>Messaging APIs</h3>
+
+ <ul>
+ <li><a href="/proton/index.html">Qpid Proton</a></li>
+ <li><a href="/components/jms/index.html">Qpid JMS</a></li>
+ <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
+ </ul>
+ </section>
+
+ <section>
+ <h3>Servers and tools</h3>
+
+ <ul>
+ <li><a href="/components/java-broker/index.html">Java broker</a></li>
+ <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
+ <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
+ </ul>
+ </section>
+
+ <section>
+ <h3>Resources</h3>
+
+ <ul>
+ <li><a href="/dashboard.html">Dashboard</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
+ <li><a href="/resources.html">More resources</a></li>
+ </ul>
+ </section>
+ </div>
+ </div>
+
+ <div id="-search" class="panel" style="display: none;">
+ <form action="http://www.google.com/search" method="get">
+ <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
+ <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
+ <button type="submit">Search</button>
+ <a href="/search.html">More ways to search</a>
+ </form>
+ </div>
+
+ <div id="-middle" class="panel">
+ <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-proton-master/index.html">Qpid Proton Master</a></li><li><a href="/releases/qpid-proton-master/proton/cpp/examples/index.html">Proton C++ Examples</a></li><li>fake_cpp11.hpp</li></ul>
+
+ <div id="-middle-content">
+
+<h1>fake_cpp11.hpp</h1>
+<div class="highlight"><pre><span></span><span class="cp">#ifndef FAKE_CPP11_HPP</span>
+<span class="cp">#define FAKE_CPP11_HPP</span>
+
+
+
+<span class="c1">/// These definitions allow us to use some new C++11 features in previous compilers</span>
+<span class="c1">/// by defining the new keywords to macro replace with nothing.</span>
+<span class="c1">///</span>
+<span class="c1">/// This is a bit of a hack and works with this small controlled source base because</span>
+<span class="c1">/// we know we don't use any of the new context sensitive keywords anywhere.</span>
+<span class="c1">///</span>
+<span class="c1">/// It is not recommended to copy this - just use C++11/C++14 instead!</span>
+
+<span class="cp">#if __cplusplus < 201103L</span>
+<span class="cp">#define override</span>
+<span class="cp">#endif</span>
+
+
+<span class="cp">#endif </span><span class="c1">// FAKE_CPP11_HPP</span>
+</pre></div>
+
+<p><a href="fake_cpp11.hpp">Download this file</a></p>
+
+
+ <hr/>
+
+ <ul id="-apache-navigation">
+ <li><a href="http://www.apache.org/">Apache</a></li>
+ <li><a href="http://www.apache.org/licenses/">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+ </ul>
+
+ <p id="-legal">
+ Apache Qpid, Messaging built on AMQP; Copyright © 2015
+ The Apache Software Foundation; Licensed under
+ the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+ License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
+ Proton, Apache, the Apache feather logo, and the Apache Qpid
+ project logo are trademarks of The Apache Software
+ Foundation; All other marks mentioned may be trademarks or
+ registered trademarks of their respective owners
+ </p>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp Thu Apr 14 18:29:35 2016
@@ -19,13 +19,15 @@
*
*/
+#include "proton/connection.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
#include "proton/handler.hpp"
#include "proton/url.hpp"
#include <iostream>
+#include "fake_cpp11.hpp"
+
class hello_world : public proton::handler {
private:
proton::url url;
@@ -33,21 +35,21 @@ class hello_world : public proton::handl
public:
hello_world(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());
conn.open_sender(url.path());
}
- 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;
- e.connection().close();
+ void on_message(proton::delivery &d, proton::message &m) override {
+ std::cout << m.body() << std::endl;
+ d.connection().close();
}
};
Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld.cpp.html Thu Apr 14 18:29:35 2016
@@ -116,13 +116,15 @@ https://github.com/apache/qpid-proton/bl
<div id="-middle-content">
<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>
@@ -130,21 +132,21 @@ https://github.com/apache/qpid-proton/bl
<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/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp Thu Apr 14 18:29:35 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/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/helloworld_direct.cpp.html Thu Apr 14 18:29:35 2016
@@ -117,12 +117,16 @@ https://github.com/apache/qpid-proton/bl
<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>
@@ -131,26 +135,26 @@ https://github.com/apache/qpid-proton/bl
<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/docs/releases/qpid-proton-master/proton/cpp/examples/index.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/index.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/index.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/index.html Thu Apr 14 18:29:35 2016
@@ -126,6 +126,7 @@ https://github.com/apache/qpid-proton/bl
<li><a href="direct_recv.cpp.html">direct_recv.cpp</a></li>
<li><a href="direct_send.cpp.html">direct_send.cpp</a></li>
<li><a href="encode_decode.cpp.html">encode_decode.cpp</a></li>
+<li><a href="fake_cpp11.hpp.html">fake_cpp11.hpp</a></li>
<li><a href="helloworld.cpp.html">helloworld.cpp</a></li>
<li><a href="helloworld_direct.cpp.html">helloworld_direct.cpp</a></li>
<li><a href="options.hpp.html">options.hpp</a></li>
Modified: qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp Thu Apr 14 18:29:35 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/docs/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/queue_browser.cpp.html Thu Apr 14 18:29:35 2016
@@ -116,14 +116,16 @@ https://github.com/apache/qpid-proton/bl
<div id="-middle-content">
<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>
@@ -131,16 +133,16 @@ https://github.com/apache/qpid-proton/bl
<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/docs/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp Thu Apr 14 18:29:35 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/docs/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/recurring_timer.cpp.html Thu Apr 14 18:29:35 2016
@@ -119,21 +119,22 @@ https://github.com/apache/qpid-proton/bl
<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>
@@ -149,28 +150,28 @@ https://github.com/apache/qpid-proton/bl
<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/docs/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp Thu Apr 14 18:29:35 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/docs/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/selected_recv.cpp.html Thu Apr 14 18:29:35 2016
@@ -116,14 +116,16 @@ https://github.com/apache/qpid-proton/bl
<div id="-middle-content">
<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>
@@ -131,13 +133,13 @@ https://github.com/apache/qpid-proton/bl
<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/docs/releases/qpid-proton-master/proton/cpp/examples/server.cpp
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server.cpp?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server.cpp (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server.cpp Thu Apr 14 18:29:35 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/docs/releases/qpid-proton-master/proton/cpp/examples/server.cpp.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server.cpp.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server.cpp.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server.cpp.html Thu Apr 14 18:29:35 2016
@@ -120,7 +120,6 @@ https://github.com/apache/qpid-proton/bl
<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>
@@ -129,6 +128,8 @@ https://github.com/apache/qpid-proton/bl
<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>
@@ -139,8 +140,8 @@ https://github.com/apache/qpid-proton/bl
<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>
@@ -155,15 +156,15 @@ https://github.com/apache/qpid-proton/bl
<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/docs/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp Thu Apr 14 18:29:35 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/docs/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp.html?rev=1739159&r1=1739158&r2=1739159&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp.html (original)
+++ qpid/site/docs/releases/qpid-proton-master/proton/cpp/examples/server_direct.cpp.html Thu Apr 14 18:29:35 2016
@@ -120,8 +120,8 @@ https://github.com/apache/qpid-proton/bl
<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>
@@ -130,6 +130,8 @@ https://github.com/apache/qpid-proton/bl
<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>
@@ -140,8 +142,8 @@ https://github.com/apache/qpid-proton/bl
<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>
@@ -161,30 +163,28 @@ https://github.com/apache/qpid-proton/bl
<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>
@@ -199,7 +199,7 @@ https://github.com/apache/qpid-proton/bl
<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org