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/07/13 10:23:31 UTC

[04/51] [abbrv] [partial] qpid-site git commit: QPID-7350: Update the proton master snapshot

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1d69f2e6/content/releases/qpid-proton-master/proton/cpp/api/default__container_8hpp_source.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/default__container_8hpp_source.html b/content/releases/qpid-proton-master/proton/cpp/api/default__container_8hpp_source.html
index 901c02a..0a5dc81 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/default__container_8hpp_source.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/default__container_8hpp_source.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.10"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <title>Qpid Proton C++ API: proton/default_container.hpp Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
@@ -55,7 +55,7 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.10 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
@@ -93,100 +93,10 @@ $(document).ready(function(){initNavTree('default__container_8hpp_source.html','
 <div class="title">default_container.hpp</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="preprocessor">#ifndef PROTON_DEFAULT_CONTAINER_HPP</span></div>
-<div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="preprocessor">#define PROTON_DEFAULT_CONTAINER_HPP</span></div>
-<div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;</div>
-<div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">/*</span></div>
-<div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * Licensed to the Apache Software Foundation (ASF) under one</span></div>
-<div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * or more contributor license agreements.  See the NOTICE file</span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> * distributed with this work for additional information</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment"> * regarding copyright ownership.  The ASF licenses this file</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment"> * to you under the Apache License, Version 2.0 (the</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="comment"> * &quot;License&quot;); you may not use this file except in compliance</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="comment"> * with the License.  You may obtain a copy of the License at</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="comment"> *   http://www.apache.org/licenses/LICENSE-2.0</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="comment"> * Unless required by applicable law or agreed to in writing,</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="comment"> * software distributed under the License is distributed on an</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="comment"> * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment"> * KIND, either express or implied.  See the License for the</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="comment"> * specific language governing permissions and limitations</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment"> * under the License.</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment"> */</span></div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="comment">// FIXME aconway 2016-05-04: doc</span></div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#include &quot;proton/container.hpp&quot;</span></div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceproton.html">proton</a> {</div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;</div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="comment">// FIXME aconway 2016-05-04: doc</span></div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div>
-<div class="line"><a name="l00034"></a><span class="lineno"><a class="line" href="classproton_1_1default__container.html">   34</a></span>&#160;<span class="keyword">class </span>PN_CPP_CLASS_EXTERN  <a class="code" href="classproton_1_1default__container.html">default_container</a> : <span class="keyword">public</span> <a class="code" href="classproton_1_1container.html">container</a> {</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;  <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;    PN_CPP_EXTERN <span class="keyword">explicit</span> <a class="code" href="classproton_1_1default__container.html">default_container</a>(<a class="code" href="classproton_1_1messaging__handler.html">proton::messaging_handler</a>&amp; h, <span class="keyword">const</span> std::string&amp; <span class="keywordtype">id</span> = <span class="stringliteral">&quot;&quot;</span>);</div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    PN_CPP_EXTERN <span class="keyword">explicit</span> default_container(<span class="keyword">const</span> std::string&amp; <span class="keywordtype">id</span> = <span class="stringliteral">&quot;&quot;</span>);</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;</div>
-<div class="line"><a name="l00055"></a><span class="lineno"><a class="line" href="classproton_1_1default__container.html#a07da6400df75b9e238160f905c64dcff">   55</a></span>&#160;    PN_CPP_EXTERN <span class="keyword">explicit</span> <a class="code" href="classproton_1_1default__container.html#a07da6400df75b9e238160f905c64dcff">default_container</a>(<a class="code" href="classproton_1_1container.html">container</a>* c) : impl_(c) {}</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    <span class="comment">// FIXME aconway 2016-05-13: @copydoc all.</span></div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    PN_CPP_EXTERN returned&lt;connection&gt; connect(<span class="keyword">const</span> std::string&amp; <a class="code" href="classproton_1_1url.html">url</a>, <span class="keyword">const</span> <a class="code" href="classproton_1_1connection__options.html">connection_options</a> &amp;) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    PN_CPP_EXTERN <a class="code" href="classproton_1_1listener.html">listener</a> listen(const <a class="code" href="namespacestd.html">std</a>::<span class="keywordtype">string</span>&amp; url, <a class="code" href="classproton_1_1listen__handler.html">listen_handler</a>&amp; l) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> stop_listening(const <a class="code" href="namespacestd.html">std</a>::<span class="keywordtype">string</span>&amp; url) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> run() PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> auto_stop(<span class="keywordtype">bool</span> set) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> stop(const <a class="code" href="classproton_1_1error__condition.html">error_condition</a>&amp; err = <a class="code" href="classproton_1_1error__condition.html">error_condition</a>()) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;    PN_CPP_EXTERN returned&lt;<a class="code" href="classproton_1_1sender.html">sender</a>&gt; open_sender(</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;        const <a class="code" href="namespacestd.html">std</a>::<span class="keywordtype">string</span> &amp;url,</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;        const <a class="code" href="namespaceproton.html">proton</a>::<a class="code" href="classproton_1_1sender__options.html">sender_options</a> &amp;o = <a class="code" href="namespaceproton.html">proton</a>::<a class="code" href="classproton_1_1sender__options.html">sender_options</a>(),</div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;        const <a class="code" href="classproton_1_1connection__options.html">connection_options</a> &amp;c = <a class="code" href="classproton_1_1connection__options.html">connection_options</a>()) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;</div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;    PN_CPP_EXTERN returned&lt;<a class="code" href="classproton_1_1receiver.html">receiver</a>&gt; open_receiver(</div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;        const <a class="code" href="namespacestd.html">std</a>::<span class="keywordtype">string</span>&amp;url,</div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;        const <a class="code" href="namespaceproton.html">proton</a>::<a class="code" href="classproton_1_1receiver__options.html">receiver_options</a> &amp;o = <a class="code" href="namespaceproton.html">proton</a>::<a class="code" href="classproton_1_1receiver__options.html">receiver_options</a>(),</div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;        const <a class="code" href="classproton_1_1connection__options.html">connection_options</a> &amp;c = <a class="code" href="classproton_1_1connection__options.html">connection_options</a>()) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    PN_CPP_EXTERN <a class="code" href="namespacestd.html">std</a>::<span class="keywordtype">string</span> <span class="keywordtype">id</span>() const PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> client_connection_options(const <a class="code" href="classproton_1_1connection__options.html">connection_options</a> &amp;o) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    PN_CPP_EXTERN <a class="code" href="classproton_1_1connection__options.html">connection_options</a> client_connection_options() const PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> server_connection_options(const <a class="code" href="classproton_1_1connection__options.html">connection_options</a> &amp;o) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;    PN_CPP_EXTERN <a class="code" href="classproton_1_1connection__options.html">connection_options</a> server_connection_options() const PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> sender_options(const class sender_options &amp;o) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    PN_CPP_EXTERN class sender_options sender_options() const PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> receiver_options(const class receiver_options &amp; o) PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    PN_CPP_EXTERN class receiver_options receiver_options() const PN_CPP_OVERRIDE;</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;  private:</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;    internal::pn_unique_ptr&lt;<a class="code" href="classproton_1_1container.html">container</a>&gt; impl_;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;};</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;} <span class="comment">// proton</span></div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;<span class="preprocessor">#endif // PROTON_DEFAULT_CONTAINER_HPP</span></div>
-<div class="ttc" id="classproton_1_1container_html"><div class="ttname"><a href="classproton_1_1container.html">proton::container</a></div><div class="ttdoc">A top-level container of connections, sessions, senders, and receivers. </div><div class="ttdef"><b>Definition:</b> container.hpp:61</div></div>
-<div class="ttc" id="classproton_1_1listener_html"><div class="ttname"><a href="classproton_1_1listener.html">proton::listener</a></div><div class="ttdoc">A listener for incoming connections. </div><div class="ttdef"><b>Definition:</b> listener.hpp:32</div></div>
-<div class="ttc" id="classproton_1_1sender_html"><div class="ttname"><a href="classproton_1_1sender.html">proton::sender</a></div><div class="ttdoc">A channel for sending messages. </div><div class="ttdef"><b>Definition:</b> sender.hpp:40</div></div>
-<div class="ttc" id="classproton_1_1sender__options_html"><div class="ttname"><a href="classproton_1_1sender__options.html">proton::sender_options</a></div><div class="ttdoc">Options for creating a sender. </div><div class="ttdef"><b>Definition:</b> sender_options.hpp:64</div></div>
-<div class="ttc" id="namespacestd_html"><div class="ttname"><a href="namespacestd.html">std</a></div><div class="ttdoc">STL namespace. </div></div>
-<div class="ttc" id="classproton_1_1default__container_html_a07da6400df75b9e238160f905c64dcff"><div class="ttname"><a href="classproton_1_1default__container.html#a07da6400df75b9e238160f905c64dcff">proton::default_container::default_container</a></div><div class="ttdeci">default_container(container *c)</div><div class="ttdoc">Wrap an existing container implementation as a default_container. </div><div class="ttdef"><b>Definition:</b> default_container.hpp:55</div></div>
-<div class="ttc" id="classproton_1_1connection__options_html"><div class="ttname"><a href="classproton_1_1connection__options.html">proton::connection_options</a></div><div class="ttdoc">Options for creating a connection. </div><div class="ttdef"><b>Definition:</b> connection_options.hpp:67</div></div>
-<div class="ttc" id="classproton_1_1default__container_html"><div class="ttname"><a href="classproton_1_1default__container.html">proton::default_container</a></div><div class="ttdoc">A single-threaded container. </div><div class="ttdef"><b>Definition:</b> default_container.hpp:34</div></div>
-<div class="ttc" id="classproton_1_1url_html"><div class="ttname"><a href="classproton_1_1url.html">proton::url</a></div><div class="ttdoc">A Proton URL. </div><div class="ttdef"><b>Definition:</b> url.hpp:55</div></div>
-<div class="ttc" id="classproton_1_1receiver__options_html"><div class="ttname"><a href="classproton_1_1receiver__options.html">proton::receiver_options</a></div><div class="ttdoc">Options for creating a receiver. </div><div class="ttdef"><b>Definition:</b> receiver_options.hpp:62</div></div>
-<div class="ttc" id="classproton_1_1receiver_html"><div class="ttname"><a href="classproton_1_1receiver.html">proton::receiver</a></div><div class="ttdoc">A channel for receiving messages. </div><div class="ttdef"><b>Definition:</b> receiver.hpp:38</div></div>
-<div class="ttc" id="classproton_1_1listen__handler_html"><div class="ttname"><a href="classproton_1_1listen__handler.html">proton::listen_handler</a></div><div class="ttdoc">Experimental - A handler for incoming connections. </div><div class="ttdef"><b>Definition:</b> listen_handler.hpp:32</div></div>
-<div class="ttc" id="classproton_1_1messaging__handler_html"><div class="ttname"><a href="classproton_1_1messaging__handler.html">proton::messaging_handler</a></div><div class="ttdoc">A handler for Proton messaging events. </div><div class="ttdef"><b>Definition:</b> messaging_handler.hpp:75</div></div>
-<div class="ttc" id="namespaceproton_html"><div class="ttname"><a href="namespaceproton.html">proton</a></div><div class="ttdoc">The main Proton namespace. </div><div class="ttdef"><b>Definition:</b> annotation_key.hpp:28</div></div>
-<div class="ttc" id="classproton_1_1error__condition_html"><div class="ttname"><a href="classproton_1_1error__condition.html">proton::error_condition</a></div><div class="ttdoc">Describes an endpoint error state. </div><div class="ttdef"><b>Definition:</b> error_condition.hpp:37</div></div>
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="preprocessor">#ifndef PROTON_DEFAULT_CONTAINER_HPP</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="preprocessor">#define PROTON_DEFAULT_CONTAINER_HPP</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;</div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">/*</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * Licensed to the Apache Software Foundation (ASF) under one</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * or more contributor license agreements.  See the NOTICE file</span></div><di
 v class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> * distributed with this work for additional information</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment"> * regarding copyright ownership.  The ASF licenses this file</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment"> * to you under the Apache License, Version 2.0 (the</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="comment"> * &quot;License&quot;); you may not use this file except in compliance</span></div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="comment"> * with the License.  You may obtain a copy of the License at</span></div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="comment"> *</span></div><div class="line"><
 a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="comment"> *   http://www.apache.org/licenses/LICENSE-2.0</span></div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="comment"> * Unless required by applicable law or agreed to in writing,</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="comment"> * software distributed under the License is distributed on an</span></div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="comment"> * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment"> * KIND, either express or implied.  See the License for the</span></div><div class="line"><a name="l00020"></a>
 <span class="lineno">   20</span>&#160;<span class="comment"> * specific language governing permissions and limitations</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment"> * under the License.</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &quot;./container.hpp&quot;</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#include &quot;./internal/config.hpp&quot;</span></div><div class="line">
 <a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">#include &quot;./internal/export.hpp&quot;</span></div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;</div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor">#include &lt;memory&gt;</span></div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="preprocessor">#include &lt;string&gt;</span></div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceproton.html">proton</a> {</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">class </span>messaging_handler;</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div><div 
 class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="comment">// Avoid deprecated diagnostics from auto_ptr</span></div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="preprocessor">#if defined(__GNUC__) &amp;&amp; __GNUC__*100 + __GNUC_MINOR__ &gt;= 406 || defined(__clang__)</span></div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="preprocessor">#pragma GCC diagnostic push</span></div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="preprocessor">#pragma GCC diagnostic ignored &quot;-Wdeprecated-declarations&quot;</span></div><div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;PN_CPP_EXTERN std::auto_ptr&lt;container&gt; <a class="code" href="namespaceproton.html#a2dba1a95c3
 f87d5ffa09f07b6b42824c">make_auto_default_container</a>(messaging_handler&amp;, <span class="keyword">const</span> std::string&amp; <span class="keywordtype">id</span>=<span class="stringliteral">&quot;&quot;</span>);</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;PN_CPP_EXTERN std::auto_ptr&lt;container&gt; <a class="code" href="namespaceproton.html#a2dba1a95c3f87d5ffa09f07b6b42824c">make_auto_default_container</a>(<span class="keyword">const</span> std::string&amp; <span class="keywordtype">id</span>=<span class="stringliteral">&quot;&quot;</span>);</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;<span class="preprocessor">#if PN_CPP_HAS_UNIQUE_PTR</span></div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;PN_CPP_EXTERN std::unique_ptr&lt;container&gt; make_default_container(messaging_handler&amp;,
  <span class="keyword">const</span> std::string&amp; <span class="keywordtype">id</span>=<span class="stringliteral">&quot;&quot;</span>);</div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;PN_CPP_EXTERN std::unique_ptr&lt;container&gt; make_default_container(<span class="keyword">const</span> std::string&amp; <span class="keywordtype">id</span>=<span class="stringliteral">&quot;&quot;</span>);</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;<span class="preprocessor">#if PN_CPP_HAS_UNIQUE_PTR</span></div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="keyword">class </span>default_container : <span class="keyword">public</span> container_ref&lt;std::unique_ptr&lt;contai
 ner&gt; &gt; {</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  default_container(messaging_handler&amp; h, <span class="keyword">const</span> std::string&amp; <span class="keywordtype">id</span>=<span class="stringliteral">&quot;&quot;</span>) : container_ref(make_default_container(h, <a class="code" href="classproton_1_1container__ref.html#aae9016a4b54d24cae86174baa6a38342">id</a>)) {}</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;  default_container(<span class="keyword">const</span> std::string&amp; <span class="keywordtype">id</span>=<span class="stringliteral">&quot;&quot;</span>) : container_ref(make_default_container(<a class="code" href="classproton_1_1container__ref.html#aae9016a4b54d24cae86174baa6a38342">id</a>)) {}</div><div class="line"><a name="l00056"></a><span class="lineno">  
  56</span>&#160;};</div><div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;<span class="preprocessor">#else</span></div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;<span class="keyword">class </span>default_container : <span class="keyword">public</span> container_ref&lt;std::auto_ptr&lt;container&gt; &gt; {</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;<span class="keyword">public</span>:</div><div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;  default_container(messaging_handler&amp; h, <span class="keyword">const</span> std::string&amp; <span class="keywordtype">id</span>=<span class="stringliteral">&quot;&quot;</span>) : container_ref&lt;<a class="code" href="namespacestd.html">std</a>::auto_ptr&lt;container&gt; &gt;(<a class="code" href="namespaceproton.html#a2dba1a95c3f87d5ffa09f07b6b42824c">make_auto_default_container</a>(h, id)) {}</div><div class="li
 ne"><a name="l00061"></a><span class="lineno">   61</span>&#160;  default_container(<span class="keyword">const</span> std::string&amp; <span class="keywordtype">id</span>=<span class="stringliteral">&quot;&quot;</span>) : container_ref&lt;<a class="code" href="namespacestd.html">std</a>::auto_ptr&lt;container&gt; &gt;(<a class="code" href="namespaceproton.html#a2dba1a95c3f87d5ffa09f07b6b42824c">make_auto_default_container</a>(id)) {}</div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;};</div><div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;</div><div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;<span class="preprocessor">#if defined(__GNUC__) &amp;&amp; __GNUC__*100 + __GNUC_MINOR__ &gt;= 406 || defined(__clang__)</span></div><div class="line"><a name="l00066"></a><span cl
 ass="lineno">   66</span>&#160;<span class="preprocessor">#pragma GCC diagnostic pop</span></div><div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div><div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;} <span class="comment">// proton</span></div><div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;</div><div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;<span class="preprocessor">#endif // PROTON_DEFAULT_CONTAINER_HPP</span></div><div class="ttc" id="namespacestd_html"><div class="ttname"><a href="namespacestd.html">std</a></div><div class="ttdoc">STL namespace. </div></div>
+<div class="ttc" id="classproton_1_1container__ref_html_aae9016a4b54d24cae86174baa6a38342"><div class="ttname"><a href="classproton_1_1container__ref.html#aae9016a4b54d24cae86174baa6a38342">proton::container_ref&lt; std::auto_ptr&lt; container &gt; &gt;::id</a></div><div class="ttdeci">std::string id() const</div><div class="ttdef"><b>Definition:</b> container.hpp:292</div></div>
+<div class="ttc" id="namespaceproton_html"><div class="ttname"><a href="namespaceproton.html">proton</a></div><div class="ttdoc">Type traits for mapping between AMQP and C++ types. </div><div class="ttdef"><b>Definition:</b> annotation_key.hpp:28</div></div>
+<div class="ttc" id="namespaceproton_html_a2dba1a95c3f87d5ffa09f07b6b42824c"><div class="ttname"><a href="namespaceproton.html#a2dba1a95c3f87d5ffa09f07b6b42824c">proton::make_auto_default_container</a></div><div class="ttdeci">std::auto_ptr&lt; container &gt; make_auto_default_container(messaging_handler &amp;, const std::string &amp;id=&quot;&quot;)</div><div class="ttdoc">Default container factory for C++03, not recommended unless you only have C++03. </div></div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->
@@ -195,7 +105,7 @@ $(document).ready(function(){initNavTree('default__container_8hpp_source.html','
     <li class="navelem"><a class="el" href="dir_25143d27009f52d175c1d192441a738a.html">proton</a></li><li class="navelem"><b>default_container.hpp</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.10 </li>
+    <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.11 </li>
   </ul>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1d69f2e6/content/releases/qpid-proton-master/proton/cpp/api/delivery_8hpp_source.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/delivery_8hpp_source.html b/content/releases/qpid-proton-master/proton/cpp/api/delivery_8hpp_source.html
index 9df98c9..475c3f9 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/delivery_8hpp_source.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/delivery_8hpp_source.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.10"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <title>Qpid Proton C++ API: proton/delivery.hpp Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
@@ -55,7 +55,7 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.10 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
@@ -93,75 +93,14 @@ $(document).ready(function(){initNavTree('delivery_8hpp_source.html','');});
 <div class="title">delivery.hpp</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="preprocessor">#ifndef PROTON_DELIVERY_HPP</span></div>
-<div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="preprocessor">#define PROTON_DELIVERY_HPP</span></div>
-<div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;</div>
-<div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">/*</span></div>
-<div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * Licensed to the Apache Software Foundation (ASF) under one</span></div>
-<div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * or more contributor license agreements.  See the NOTICE file</span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> * distributed with this work for additional information</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment"> * regarding copyright ownership.  The ASF licenses this file</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment"> * to you under the Apache License, Version 2.0 (the</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="comment"> * &quot;License&quot;); you may not use this file except in compliance</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="comment"> * with the License.  You may obtain a copy of the License at</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="comment"> *   http://www.apache.org/licenses/LICENSE-2.0</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="comment"> * Unless required by applicable law or agreed to in writing,</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="comment"> * software distributed under the License is distributed on an</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="comment"> * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment"> * KIND, either express or implied.  See the License for the</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="comment"> * specific language governing permissions and limitations</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment"> * under the License.</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment"> */</span></div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &quot;proton/export.hpp&quot;</span></div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">#include &quot;proton/internal/object.hpp&quot;</span></div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#include &quot;proton/transfer.hpp&quot;</span></div>
-<div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div>
-<div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#include &quot;proton/delivery.h&quot;</span></div>
-<div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor">#include &quot;proton/disposition.h&quot;</span></div>
-<div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div>
-<div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceproton.html">proton</a> {</div>
-<div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div>
-<div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">class </span>receiver;</div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div>
-<div class="line"><a name="l00040"></a><span class="lineno"><a class="line" href="classproton_1_1delivery.html">   40</a></span>&#160;<span class="keyword">class </span><a class="code" href="classproton_1_1delivery.html">delivery</a> : <span class="keyword">public</span> <a class="code" href="classproton_1_1transfer.html">transfer</a> {</div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <a class="code" href="classproton_1_1delivery.html">delivery</a>(pn_delivery_t* d);</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <a class="code" href="classproton_1_1delivery.html">delivery</a>() {}</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    PN_CPP_EXTERN <span class="keyword">class </span><a class="code" href="classproton_1_1receiver.html">receiver</a> receiver() const;</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="comment">// XXX ATM the following don&#39;t reflect the differing behaviors we</span></div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="comment">// get from the different delivery modes. - Deferred</span></div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    </div>
-<div class="line"><a name="l00055"></a><span class="lineno"><a class="line" href="classproton_1_1delivery.html#aadb9f3b844fb4cf98288cd3c60a3af91">   55</a></span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> <a class="code" href="classproton_1_1delivery.html#aadb9f3b844fb4cf98288cd3c60a3af91">accept</a>() { <a class="code" href="classproton_1_1transfer.html#a172df06404ec241cee5281536db603a7">settle</a>(ACCEPTED); }</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;</div>
-<div class="line"><a name="l00058"></a><span class="lineno"><a class="line" href="classproton_1_1delivery.html#a84e832c2421763b25e1ae0d9a76f519c">   58</a></span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> <a class="code" href="classproton_1_1delivery.html#a84e832c2421763b25e1ae0d9a76f519c">reject</a>() { <a class="code" href="classproton_1_1transfer.html#a172df06404ec241cee5281536db603a7">settle</a>(REJECTED); }</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div>
-<div class="line"><a name="l00061"></a><span class="lineno"><a class="line" href="classproton_1_1delivery.html#a23b477d0e2d399f75d585d154c346591">   61</a></span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> <a class="code" href="classproton_1_1delivery.html#a23b477d0e2d399f75d585d154c346591">release</a>() { <a class="code" href="classproton_1_1transfer.html#a172df06404ec241cee5281536db603a7">settle</a>(RELEASED); }</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
-<div class="line"><a name="l00064"></a><span class="lineno"><a class="line" href="classproton_1_1delivery.html#a7a2a3abb755d0d1a31414355520d054b">   64</a></span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> <a class="code" href="classproton_1_1delivery.html#a7a2a3abb755d0d1a31414355520d054b">modify</a>() { <a class="code" href="classproton_1_1transfer.html#a172df06404ec241cee5281536db603a7">settle</a>(MODIFIED); }</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;</div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>internal::factory&lt;<a class="code" href="classproton_1_1delivery.html">delivery</a>&gt;;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;};</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;} <span class="comment">// proton</span></div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;</div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;<span class="preprocessor">#endif // PROTON_DELIVERY_HPP</span></div>
-<div class="ttc" id="classproton_1_1delivery_html"><div class="ttname"><a href="classproton_1_1delivery.html">proton::delivery</a></div><div class="ttdoc">A received message. </div><div class="ttdef"><b>Definition:</b> delivery.hpp:40</div></div>
-<div class="ttc" id="classproton_1_1delivery_html_a84e832c2421763b25e1ae0d9a76f519c"><div class="ttname"><a href="classproton_1_1delivery.html#a84e832c2421763b25e1ae0d9a76f519c">proton::delivery::reject</a></div><div class="ttdeci">void reject()</div><div class="ttdoc">Settle with REJECTED state. </div><div class="ttdef"><b>Definition:</b> delivery.hpp:58</div></div>
-<div class="ttc" id="classproton_1_1transfer_html_a172df06404ec241cee5281536db603a7"><div class="ttname"><a href="classproton_1_1transfer.html#a172df06404ec241cee5281536db603a7">proton::transfer::settle</a></div><div class="ttdeci">void settle()</div><div class="ttdoc">Settle the delivery; informs the remote end. </div></div>
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="preprocessor">#ifndef PROTON_DELIVERY_HPP</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="preprocessor">#define PROTON_DELIVERY_HPP</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;</div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">/*</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * Licensed to the Apache Software Foundation (ASF) under one</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * or more contributor license agreements.  See the NOTICE file</span></div><div class="line"><a 
 name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> * distributed with this work for additional information</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment"> * regarding copyright ownership.  The ASF licenses this file</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment"> * to you under the Apache License, Version 2.0 (the</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="comment"> * &quot;License&quot;); you may not use this file except in compliance</span></div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="comment"> * with the License.  You may obtain a copy of the License at</span></div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00014"></
 a><span class="lineno">   14</span>&#160;<span class="comment"> *   http://www.apache.org/licenses/LICENSE-2.0</span></div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="comment"> * Unless required by applicable law or agreed to in writing,</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="comment"> * software distributed under the License is distributed on an</span></div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="comment"> * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment"> * KIND, either express or implied.  See the License for the</span></div><div class="line"><a name="l00020"></a><span class="linen
 o">   20</span>&#160;<span class="comment"> * specific language governing permissions and limitations</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment"> * under the License.</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &quot;./internal/export.hpp&quot;</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">#include &quot;./internal/object.hpp&quot;</span></div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#include 
 &quot;./transfer.hpp&quot;</span></div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#include &lt;proton/delivery.h&gt;</span></div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor">#include &lt;proton/disposition.h&gt;</span></div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;</div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceproton.html">proton</a> {</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">class </span>receiver;</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;</div><div cla
 ss="line"><a name="l00040"></a><span class="lineno"><a class="line" href="classproton_1_1delivery.html">   40</a></span>&#160;<span class="keyword">class </span><a class="code" href="classproton_1_1delivery.html">delivery</a> : <span class="keyword">public</span> <a class="code" href="classproton_1_1transfer.html">transfer</a> {</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;    <a class="code" href="classproton_1_1delivery.html">delivery</a>(pn_delivery_t* d);</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;  <span class="keyword">public</span>:</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <a class="code" href="classproton_1_1delivery.html">delivery</a>() {}</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;</div><div class="line"><a name="l00049"></a><spa
 n class="lineno">   49</span>&#160;    PN_CPP_EXTERN <span class="keyword">class </span><a class="code" href="classproton_1_1receiver.html">receiver</a> receiver() const;</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    <span class="comment">// XXX ATM the following don&#39;t reflect the differing behaviors we</span></div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="comment">// get from the different delivery modes. - Deferred</span></div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    </div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> <a class="code" href="classproton_1_1delivery.html#aadb9f3b844fb4cf98288cd3c60a3af91">accept</a>();</div><div class="line"><a name="l00056"></a><span class="lin
 eno">   56</span>&#160;</div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> <a class="code" href="classproton_1_1delivery.html#a84e832c2421763b25e1ae0d9a76f519c">reject</a>();</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div><div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> <a class="code" href="classproton_1_1delivery.html#a23b477d0e2d399f75d585d154c346591">release</a>();</div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div><div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;    PN_CPP_EXTERN <span class="keywordtype">void</span> <a class="code" href="classproton_1_1delivery.html#a7a2a3abb755d0d1a31414355520d054b">modify</a>();</div><div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;</di
 v><div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;  <span class="keyword">friend</span> <span class="keyword">class </span>internal::factory&lt;delivery&gt;;</div><div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;};</div><div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;</div><div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;} <span class="comment">// proton</span></div><div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;</div><div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;<span class="preprocessor">#endif // PROTON_DELIVERY_HPP</span></div><div class="ttc" id="classproton_1_1delivery_html"><div class="ttname"><a href="classproton_1_1delivery.html">proton::delivery</a></div><div class="ttdoc">A received message. </div><div class="ttdef"><b>Definition:</b> delivery.hpp:40</div></div>
+<div class="ttc" id="classproton_1_1delivery_html_a84e832c2421763b25e1ae0d9a76f519c"><div class="ttname"><a href="classproton_1_1delivery.html#a84e832c2421763b25e1ae0d9a76f519c">proton::delivery::reject</a></div><div class="ttdeci">void reject()</div><div class="ttdoc">Settle with REJECTED state. </div></div>
 <div class="ttc" id="classproton_1_1transfer_html"><div class="ttname"><a href="classproton_1_1transfer.html">proton::transfer</a></div><div class="ttdoc">The base class for delivery and tracker. </div><div class="ttdef"><b>Definition:</b> transfer.hpp:34</div></div>
-<div class="ttc" id="classproton_1_1delivery_html_a23b477d0e2d399f75d585d154c346591"><div class="ttname"><a href="classproton_1_1delivery.html#a23b477d0e2d399f75d585d154c346591">proton::delivery::release</a></div><div class="ttdeci">void release()</div><div class="ttdoc">Settle with RELEASED state. </div><div class="ttdef"><b>Definition:</b> delivery.hpp:61</div></div>
-<div class="ttc" id="classproton_1_1receiver_html"><div class="ttname"><a href="classproton_1_1receiver.html">proton::receiver</a></div><div class="ttdoc">A channel for receiving messages. </div><div class="ttdef"><b>Definition:</b> receiver.hpp:38</div></div>
-<div class="ttc" id="classproton_1_1delivery_html_aadb9f3b844fb4cf98288cd3c60a3af91"><div class="ttname"><a href="classproton_1_1delivery.html#aadb9f3b844fb4cf98288cd3c60a3af91">proton::delivery::accept</a></div><div class="ttdeci">void accept()</div><div class="ttdoc">Settle with ACCEPTED state. </div><div class="ttdef"><b>Definition:</b> delivery.hpp:55</div></div>
-<div class="ttc" id="classproton_1_1delivery_html_a7a2a3abb755d0d1a31414355520d054b"><div class="ttname"><a href="classproton_1_1delivery.html#a7a2a3abb755d0d1a31414355520d054b">proton::delivery::modify</a></div><div class="ttdeci">void modify()</div><div class="ttdoc">Settle with MODIFIED state. </div><div class="ttdef"><b>Definition:</b> delivery.hpp:64</div></div>
-<div class="ttc" id="namespaceproton_html"><div class="ttname"><a href="namespaceproton.html">proton</a></div><div class="ttdoc">The main Proton namespace. </div><div class="ttdef"><b>Definition:</b> annotation_key.hpp:28</div></div>
+<div class="ttc" id="classproton_1_1delivery_html_a23b477d0e2d399f75d585d154c346591"><div class="ttname"><a href="classproton_1_1delivery.html#a23b477d0e2d399f75d585d154c346591">proton::delivery::release</a></div><div class="ttdeci">void release()</div><div class="ttdoc">Settle with RELEASED state. </div></div>
+<div class="ttc" id="classproton_1_1receiver_html"><div class="ttname"><a href="classproton_1_1receiver.html">proton::receiver</a></div><div class="ttdoc">A channel for receiving messages. </div><div class="ttdef"><b>Definition:</b> receiver.hpp:39</div></div>
+<div class="ttc" id="classproton_1_1delivery_html_aadb9f3b844fb4cf98288cd3c60a3af91"><div class="ttname"><a href="classproton_1_1delivery.html#aadb9f3b844fb4cf98288cd3c60a3af91">proton::delivery::accept</a></div><div class="ttdeci">void accept()</div><div class="ttdoc">Settle with ACCEPTED state. </div></div>
+<div class="ttc" id="classproton_1_1delivery_html_a7a2a3abb755d0d1a31414355520d054b"><div class="ttname"><a href="classproton_1_1delivery.html#a7a2a3abb755d0d1a31414355520d054b">proton::delivery::modify</a></div><div class="ttdeci">void modify()</div><div class="ttdoc">Settle with MODIFIED state. </div></div>
+<div class="ttc" id="namespaceproton_html"><div class="ttname"><a href="namespaceproton.html">proton</a></div><div class="ttdoc">Type traits for mapping between AMQP and C++ types. </div><div class="ttdef"><b>Definition:</b> annotation_key.hpp:28</div></div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->
@@ -170,7 +109,7 @@ $(document).ready(function(){initNavTree('delivery_8hpp_source.html','');});
     <li class="navelem"><a class="el" href="dir_25143d27009f52d175c1d192441a738a.html">proton</a></li><li class="navelem"><b>delivery.hpp</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.10 </li>
+    <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.11 </li>
   </ul>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1d69f2e6/content/releases/qpid-proton-master/proton/cpp/api/delivery__mode_8hpp_source.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/delivery__mode_8hpp_source.html b/content/releases/qpid-proton-master/proton/cpp/api/delivery__mode_8hpp_source.html
index 33c7acf..b41502e 100755
--- a/content/releases/qpid-proton-master/proton/cpp/api/delivery__mode_8hpp_source.html
+++ b/content/releases/qpid-proton-master/proton/cpp/api/delivery__mode_8hpp_source.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.10"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
 <title>Qpid Proton C++ API: proton/delivery_mode.hpp Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
@@ -55,7 +55,7 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.10 -->
+<!-- Generated by Doxygen 1.8.11 -->
 <script type="text/javascript">
 var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </script>
@@ -93,58 +93,12 @@ $(document).ready(function(){initNavTree('delivery__mode_8hpp_source.html','');}
 <div class="title">delivery_mode.hpp</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="preprocessor">#ifndef PROTON_DELIVERY_MODE_H</span></div>
-<div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="preprocessor">#define PROTON_DELIVERY_MODE_H</span></div>
-<div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;</div>
-<div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">/*</span></div>
-<div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * Licensed to the Apache Software Foundation (ASF) under one</span></div>
-<div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * or more contributor license agreements.  See the NOTICE file</span></div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> * distributed with this work for additional information</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment"> * regarding copyright ownership.  The ASF licenses this file</span></div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment"> * to you under the Apache License, Version 2.0 (the</span></div>
-<div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="comment"> * &quot;License&quot;); you may not use this file except in compliance</span></div>
-<div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="comment"> * with the License.  You may obtain a copy of the License at</span></div>
-<div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="comment"> *   http://www.apache.org/licenses/LICENSE-2.0</span></div>
-<div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="comment"> * Unless required by applicable law or agreed to in writing,</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="comment"> * software distributed under the License is distributed on an</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="comment"> * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment"> * KIND, either express or implied.  See the License for the</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="comment"> * specific language governing permissions and limitations</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment"> * under the License.</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment"> *</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment"> */</span></div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceproton.html">proton</a> {</div>
-<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
-<div class="line"><a name="l00030"></a><span class="lineno"><a class="line" href="structproton_1_1delivery__mode.html">   30</a></span>&#160;<span class="keyword">struct </span><a class="code" href="structproton_1_1delivery__mode.html">delivery_mode</a> {</div>
-<div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">   32</a></span>&#160;    <span class="keyword">enum</span> <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">modes</a> {</div>
-<div class="line"><a name="l00035"></a><span class="lineno"><a class="line" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6ac157bdf0b85a40d2619cbc8bc1ae5fe2">   35</a></span>&#160;        <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6ac157bdf0b85a40d2619cbc8bc1ae5fe2">NONE</a> = 0,</div>
-<div class="line"><a name="l00038"></a><span class="lineno"><a class="line" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6adc975babe0d2bc27916397e614eb6624">   38</a></span>&#160;        <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6adc975babe0d2bc27916397e614eb6624">AT_MOST_ONCE</a>,</div>
-<div class="line"><a name="l00043"></a><span class="lineno"><a class="line" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6a3cf51e9f762513a58768bb63e8ba14c1">   43</a></span>&#160;        <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6a3cf51e9f762513a58768bb63e8ba14c1">AT_LEAST_ONCE</a></div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    };</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    </div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    <a class="code" href="structproton_1_1delivery__mode.html">delivery_mode</a>() : modes_(<a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6ac157bdf0b85a40d2619cbc8bc1ae5fe2">NONE</a>) {}</div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    delivery_mode(<a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">modes</a> m) : modes_(m) {}</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <span class="keyword">operator</span> <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">modes</a>() { <span class="keywordflow">return</span> modes_; }</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">modes</a> modes_;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;};</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;} <span class="comment">// proton</span></div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;<span class="preprocessor">#endif // PROTON_DELIVERY_MODE_H</span></div>
-<div class="ttc" id="structproton_1_1delivery__mode_html_a811fe196a5d9d37857c2f8adeeaac3c6"><div class="ttname"><a href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">proton::delivery_mode::modes</a></div><div class="ttdeci">modes</div><div class="ttdoc">Delivery modes. </div><div class="ttdef"><b>Definition:</b> delivery_mode.hpp:32</div></div>
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="preprocessor">#ifndef PROTON_DELIVERY_MODE_H</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="preprocessor">#define PROTON_DELIVERY_MODE_H</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;</div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">/*</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment"> * Licensed to the Apache Software Foundation (ASF) under one</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;<span class="comment"> * or more contributor license agreements.  See the NOTICE file</span></div><div class="lin
 e"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment"> * distributed with this work for additional information</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment"> * regarding copyright ownership.  The ASF licenses this file</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment"> * to you under the Apache License, Version 2.0 (the</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="comment"> * &quot;License&quot;); you may not use this file except in compliance</span></div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;<span class="comment"> * with the License.  You may obtain a copy of the License at</span></div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l000
 14"></a><span class="lineno">   14</span>&#160;<span class="comment"> *   http://www.apache.org/licenses/LICENSE-2.0</span></div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="comment"> * Unless required by applicable law or agreed to in writing,</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="comment"> * software distributed under the License is distributed on an</span></div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="comment"> * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment"> * KIND, either express or implied.  See the License for the</span></div><div class="line"><a name="l00020"></a><span class=
 "lineno">   20</span>&#160;<span class="comment"> * specific language governing permissions and limitations</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment"> * under the License.</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="comment"> *</span></div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;</div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="keyword">namespace </span><a class="code" href="namespaceproton.html">proton</a> {</div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div><div class="line"><a name="l00030"></a><span class="lineno"><a class="line" href="structproton_1_1delivery__mode.html">   30</a></span>&#160;<span class="keyword">st
 ruct </span><a class="code" href="structproton_1_1delivery__mode.html">delivery_mode</a> {</div><div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">   32</a></span>&#160;    <span class="keyword">enum</span> <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">modes</a> {</div><div class="line"><a name="l00035"></a><span class="lineno"><a class="line" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6ac157bdf0b85a40d2619cbc8bc1ae5fe2">   35</a></span>&#160;        <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6ac157bdf0b85a40d2619cbc8bc1ae5fe2">NONE</a> = 0,</div><div class="line"><a name="l00038"></a><span class="lineno"><a class="line" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6adc975babe0d2bc27916397e614eb6624">   38</a></span>&#160;        <
 a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6adc975babe0d2bc27916397e614eb6624">AT_MOST_ONCE</a>,</div><div class="line"><a name="l00043"></a><span class="lineno"><a class="line" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6a3cf51e9f762513a58768bb63e8ba14c1">   43</a></span>&#160;        <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6a3cf51e9f762513a58768bb63e8ba14c1">AT_LEAST_ONCE</a></div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    };</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    </div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    <a class="code" href="structproton_1_1delivery__mode.html">delivery_mode</a>() : modes_(<a class="code" href="structproton_1_1delivery__mode
 .html#a811fe196a5d9d37857c2f8adeeaac3c6ac157bdf0b85a40d2619cbc8bc1ae5fe2">NONE</a>) {}</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <a class="code" href="structproton_1_1delivery__mode.html">delivery_mode</a>(<a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">modes</a> m) : modes_(m) {}</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <span class="keyword">operator</span> <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">modes</a>() { <span class="keywordflow">return</span> modes_; }</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;  <span class="keyword">private</span>:</div><div class="line"><a name="l00055"></a><span cl
 ass="lineno">   55</span>&#160;    <a class="code" href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">modes</a> modes_;</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;};</div><div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;} <span class="comment">// proton</span></div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;</div><div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;<span class="preprocessor">#endif // PROTON_DELIVERY_MODE_H</span></div><div class="ttc" id="structproton_1_1delivery__mode_html_a811fe196a5d9d37857c2f8adeeaac3c6"><div class="ttname"><a href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6">proton::delivery_mode::modes</a></div><div class="ttdeci">modes</div><div class="ttdoc">Delivery modes. </div><div class="ttde
 f"><b>Definition:</b> delivery_mode.hpp:32</div></div>
 <div class="ttc" id="structproton_1_1delivery__mode_html"><div class="ttname"><a href="structproton_1_1delivery__mode.html">proton::delivery_mode</a></div><div class="ttdoc">The message delivery policy to establish when opening a link. </div><div class="ttdef"><b>Definition:</b> delivery_mode.hpp:30</div></div>
 <div class="ttc" id="structproton_1_1delivery__mode_html_a811fe196a5d9d37857c2f8adeeaac3c6a3cf51e9f762513a58768bb63e8ba14c1"><div class="ttname"><a href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6a3cf51e9f762513a58768bb63e8ba14c1">proton::delivery_mode::AT_LEAST_ONCE</a></div><div class="ttdoc">The receiver settles the delivery first with an accept/reject/release disposition. </div><div class="ttdef"><b>Definition:</b> delivery_mode.hpp:43</div></div>
 <div class="ttc" id="structproton_1_1delivery__mode_html_a811fe196a5d9d37857c2f8adeeaac3c6adc975babe0d2bc27916397e614eb6624"><div class="ttname"><a href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6adc975babe0d2bc27916397e614eb6624">proton::delivery_mode::AT_MOST_ONCE</a></div><div class="ttdoc">Outgoing messages are settled immediately by the link. </div><div class="ttdef"><b>Definition:</b> delivery_mode.hpp:38</div></div>
 <div class="ttc" id="structproton_1_1delivery__mode_html_a811fe196a5d9d37857c2f8adeeaac3c6ac157bdf0b85a40d2619cbc8bc1ae5fe2"><div class="ttname"><a href="structproton_1_1delivery__mode.html#a811fe196a5d9d37857c2f8adeeaac3c6ac157bdf0b85a40d2619cbc8bc1ae5fe2">proton::delivery_mode::NONE</a></div><div class="ttdoc">No set policy. </div><div class="ttdef"><b>Definition:</b> delivery_mode.hpp:35</div></div>
-<div class="ttc" id="namespaceproton_html"><div class="ttname"><a href="namespaceproton.html">proton</a></div><div class="ttdoc">The main Proton namespace. </div><div class="ttdef"><b>Definition:</b> annotation_key.hpp:28</div></div>
+<div class="ttc" id="namespaceproton_html"><div class="ttname"><a href="namespaceproton.html">proton</a></div><div class="ttdoc">Type traits for mapping between AMQP and C++ types. </div><div class="ttdef"><b>Definition:</b> annotation_key.hpp:28</div></div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->
@@ -153,7 +107,7 @@ $(document).ready(function(){initNavTree('delivery__mode_8hpp_source.html','');}
     <li class="navelem"><a class="el" href="dir_25143d27009f52d175c1d192441a738a.html">proton</a></li><li class="navelem"><b>delivery_mode.hpp</b></li>
     <li class="footer">Generated by
     <a href="http://www.doxygen.org/index.html">
-    <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.10 </li>
+    <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.11 </li>
   </ul>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/1d69f2e6/content/releases/qpid-proton-master/proton/cpp/api/deprecated.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-proton-master/proton/cpp/api/deprecated.html b/content/releases/qpid-proton-master/proton/cpp/api/deprecated.html
new file mode 100755
index 0000000..984e6e3
--- /dev/null
+++ b/content/releases/qpid-proton-master/proton/cpp/api/deprecated.html
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<title>Qpid Proton C++ API: Deprecated List</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+  $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">Qpid Proton C++ API
+   &#160;<span id="projectnumber">master</span>
+   </div>
+  </td>
+   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+</td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('deprecated.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">Deprecated List </div>  </div>
+</div><!--header-->
+<div class="contents">
+<div class="textblock"><dl class="reflist">
+<dt><a class="anchor" id="_deprecated000001"></a>Class <a class="el" href="classproton_1_1inject__handler.html">inject_handler</a>  </dt>
+<dd>use <a class="el" href="classproton_1_1void__function0.html" title="A C++03 compatible void no-argument callback function object, used by container::schedule() and event...">void_function0</a>. </dd>
+</dl>
+</div></div><!-- contents -->
+</div><!-- doc-content -->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="footer">Generated by
+    <a href="http://www.doxygen.org/index.html">
+    <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.11 </li>
+  </ul>
+</div>
+</body>
+</html>


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