Author: buildbot Date: Mon Jan 7 22:12:03 2019 New Revision: 1038673 Log: Staging update by buildbot for thrift
Modified: websites/staging/thrift/trunk/content/ (props changed) websites/staging/thrift/trunk/content/tutorial/cpp.html Propchange: websites/staging/thrift/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Mon Jan 7 22:12:03 2019 @@ -1 +1 @@ -1850464 +1850697 Modified: websites/staging/thrift/trunk/content/tutorial/cpp.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/cpp.html (original) +++ websites/staging/thrift/trunk/content/tutorial/cpp.html Mon Jan 7 22:12:03 2019 @@ -120,7 +120,6 @@ h2:hover > .headerlink, h3:hover > .head <span class="cp">#include <thrift/protocol/TBinaryProtocol.h></span> <span class="cp">#include <thrift/transport/TSocket.h></span> <span class="cp">#include <thrift/transport/TTransportUtils.h></span> -<span class="cp">#include <thrift/stdcxx.h></span> <span class="cp">#include "../gen-cpp/Calculator.h"</span> @@ -133,9 +132,9 @@ h2:hover > .headerlink, h3:hover > .head <span class="k">using</span> <span class="k">namespace</span> <span class="n">shared</span><span class="p">;</span> <span class="kt">int</span> <span class="n">main</span><span class="p">()</span> <span class="p">{</span> - <span class="n">stdcxx</span><span class="o">::</span><span class="n">shared_ptr</span><span class="o"><</span><span class="n">TTransport</span><span class="o">></span> <span class="n">socket</span><span class="p">(</span><span class="k">new</span> <span class="n">TSocket</span><span class="p">(</span><span class="s">"localhost"</span><span class="p">,</span> <span class="mi">9090</span><span class="p">));</span> - <span class="n">stdcxx</span><span class="o">::</span><span class="n">shared_ptr</span><span class="o"><</span><span class="n">TTransport</span><span class="o">></span> <span class="n">transport</span><span class="p">(</span><span class="k">new</span> <span class="n">TBufferedTransport</span><span class="p">(</span><span class="n">socket</span><span class="p">));</span> - <span class="n">stdcxx</span><span class="o">::</span><span class="n">shared_ptr</span><span class="o"><</span><span class="n">TProtocol</span><span class="o">></span> <span class="n">protocol</span><span class="p">(</span><span class="k">new</span> <span class="n">TBinaryProtocol</span><span class="p">(</span><span class="n">transport</span><span class="p">));</span> + <span class="n">std</span><span class="o">::</span><span class="n">shared_ptr</span><span class="o"><</span><span class="n">TTransport</span><span class="o">></span> <span class="n">socket</span><span class="p">(</span><span class="k">new</span> <span class="n">TSocket</span><span class="p">(</span><span class="s">"localhost"</span><span class="p">,</span> <span class="mi">9090</span><span class="p">));</span> + <span class="n">std</span><span class="o">::</span><span class="n">shared_ptr</span><span class="o"><</span><span class="n">TTransport</span><span class="o">></span> <span class="n">transport</span><span class="p">(</span><span class="k">new</span> <span class="n">TBufferedTransport</span><span class="p">(</span><span class="n">socket</span><span class="p">));</span> + <span class="n">std</span><span class="o">::</span><span class="n">shared_ptr</span><span class="o"><</span><span class="n">TProtocol</span><span class="o">></span> <span class="n">protocol</span><span class="p">(</span><span class="k">new</span> <span class="n">TBinaryProtocol</span><span class="p">(</span><span class="n">transport</span><span class="p">));</span> <span class="n">CalculatorClient</span> <span class="n">client</span><span class="p">(</span><span class="n">protocol</span><span class="p">);</span> <span class="k">try</span> <span class="p">{</span> @@ -207,7 +206,6 @@ h2:hover > .headerlink, h3:hover > .head <span class="cp">#include <thrift/transport/TSocket.h></span> <span class="cp">#include <thrift/transport/TTransportUtils.h></span> <span class="cp">#include <thrift/TToString.h></span> -<span class="cp">#include <thrift/stdcxx.h></span> <span class="cp">#include <iostream></span> <span class="cp">#include <stdexcept></span> @@ -297,7 +295,7 @@ h2:hover > .headerlink, h3:hover > .head <span class="k">virtual</span> <span class="o">~</span><span class="n">CalculatorCloneFactory</span><span class="p">()</span> <span class="p">{}</span> <span class="k">virtual</span> <span class="n">CalculatorIf</span><span class="o">*</span> <span class="n">getHandler</span><span class="p">(</span><span class="k">const</span> <span class="o">::</span><span class="n">apache</span><span class="o">::</span><span class="n">thrift</span><span class="o">::</span><span class="n">TConnectionInfo</span><span class="o">&</span> <span class="n">connInfo</span><span class="p">)</span> <span class="p">{</span> - <span class="n">stdcxx</span><span class="o">::</span><span class="n">shared_ptr</span><span class="o"><</span><span class="n">TSocket</span><span class="o">></span> <span class="n">sock</span> <span class="o">=</span> <span class="n">stdcxx</span><span class="o">::</span><span class="n">dynamic_pointer_cast</span><span class="o"><</span><span class="n">TSocket</span><span class="o">></span><span class="p">(</span><span class="n">connInfo</span><span class="p">.</span><span class="n">transport</span><span class="p">);</span> + <span class="n">std</span><span class="o">::</span><span class="n">shared_ptr</span><span class="o"><</span><span class="n">TSocket</span><span class="o">></span> <span class="n">sock</span> <span class="o">=</span> <span class="n">std</span><span class="o">::</span><span class="n">dynamic_pointer_cast</span><span class="o"><</span><span class="n">TSocket</span><span class="o">></span><span class="p">(</span><span class="n">connInfo</span><span class="p">.</span><span class="n">transport</span><span class="p">);</span> <span class="n">cout</span> <span class="o"><<</span> <span class="s">"Incoming connection</span><span class="se">\n</span><span class="s">"</span><span class="p">;</span> <span class="n">cout</span> <span class="o"><<</span> <span class="s">"</span><span class="se">\t</span><span class="s">SocketInfo: "</span> <span class="o"><<</span> <span class="n">sock</span><span class="o">-></span><span class="n">getSocketInfo</span><span class="p">()</span> <span class="o"><<</span> <span class="s">"</span><span class="se">\n</span><span class="s">"</span><span class="p">;</span> <span class="n">cout</span> <span class="o"><<</span> <span class="s">"</span><span class="se">\t</span><span class="s">PeerHost: "</span> <span class="o"><<</span> <span class="n">sock</span><span class="o">-></span><span class="n">getPeerHost</span><span class="p">()</span> <span class="o"><<</span> <span class="s">"</span><span class="se">\n</span><span class="s">"</span><span class="p">;</span> @@ -312,24 +310,25 @@ h2:hover > .headerlink, h3:hover > .head <span class="kt">int</span> <span class="n">main</span><span class="p">()</span> <span class="p">{</span> <span class="n">TThreadedServer</span> <span class="n">server</span><span class="p">(</span> - <span class="n">stdcxx</span><span class="o">::</span><span class="n">make_shared</span><span class="o"><</span><span class="n">CalculatorProcessorFactory</span><span class="o">></span><span class="p">(</span><span class="n">stdcxx</span><span class="o">::</span><span class="n">make_shared</span><span class="o"><</span><span class="n">CalculatorCloneFactory</span><span class="o">></span><span class="p">()),</span> - <span class="n">stdcxx</span><span class="o">::</span><span class="n">make_shared</span><span class="o"><</span><span class="n">TServerSocket</span><span class="o">></span><span class="p">(</span><span class="mi">9090</span><span class="p">),</span> <span class="c1">//port</span> - <span class="n">stdcxx</span><span class="o">::</span><span class="n">make_shared</span><span class="o"><</span><span class="n">TBufferedTransportFactory</span><span class="o">></span><span class="p">(),</span> - <span class="n">stdcxx</span><span class="o">::</span><span class="n">make_shared</span><span class="o"><</span><span class="n">TBinaryProtocolFactory</span><span class="o">></span><span class="p">());</span> + <span class="n">std</span><span class="o">::</span><span class="n">make_shared</span><span class="o"><</span><span class="n">CalculatorProcessorFactory</span><span class="o">></span><span class="p">(</span><span class="n">std</span><span class="o">::</span><span class="n">make_shared</span><span class="o"><</span><span class="n">CalculatorCloneFactory</span><span class="o">></span><span class="p">()),</span> + <span class="n">std</span><span class="o">::</span><span class="n">make_shared</span><span class="o"><</span><span class="n">TServerSocket</span><span class="o">></span><span class="p">(</span><span class="mi">9090</span><span class="p">),</span> <span class="c1">//port</span> + <span class="n">std</span><span class="o">::</span><span class="n">make_shared</span><span class="o"><</span><span class="n">TBufferedTransportFactory</span><span class="o">></span><span class="p">(),</span> + <span class="n">std</span><span class="o">::</span><span class="n">make_shared</span><span class="o"><</span><span class="n">TBinaryProtocolFactory</span><span class="o">></span><span class="p">());</span> <span class="cm">/*</span> <span class="cm"> // if you don't need per-connection state, do the following instead</span> <span class="cm"> TThreadedServer server(</span> -<span class="cm"> stdcxx::make_shared<CalculatorProcessor>(stdcxx::make_shared<CalculatorHandler>()),</span> -<span class="cm"> stdcxx::make_shared<TServerSocket>(9090), //port</span> -<span class="cm"> stdcxx::make_shared<TBufferedTransportFactory>(),</span> -<span class="cm"> stdcxx::make_shared<TBinaryProtocolFactory>());</span> +<span class="cm"> std::make_shared<CalculatorProcessor>(std::make_shared<CalculatorHandler>()),</span> +<span class="cm"> std::make_shared<TServerSocket>(9090), //port</span> +<span class="cm"> std::make_shared<TBufferedTransportFactory>(),</span> +<span class="cm"> std::make_shared<TBinaryProtocolFactory>());</span> <span class="cm"> */</span> <span class="o">/**</span> <span class="o">*</span> <span class="n">Here</span> <span class="n">are</span> <span class="n">some</span> <span class="n">alternate</span> <span class="n">server</span> <span class="n">types</span><span class="p">...</span> <span class="c1">// This server only allows one connection at a time, but spawns no threads</span> + <span class="n">TSimpleServer</span> <span class="n">server</span><span class="p">(</span> </pre></div> <p class='snippet_footer'> @@ -351,8 +350,7 @@ h2:hover > .headerlink, h3:hover > .head } h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style> -<div class="codehilite"><pre> <span class="p">{</span> - <span class="n">stdcxx</span><span class="o">::</span><span class="n">shared_ptr</span><span class="o"><</span><span class="n">TSocket</span><span class="o">></span> <span class="n">sock</span> <span class="o">=</span> <span class="n">stdcxx</span><span class="o">::</span><span class="n">dynamic_pointer_cast</span><span class="o"><</span><span class="n">TSocket</span><span class="o">></span><span class="p">(</span><span class="n">connInfo</span><span class="p">.</span><span class="n">transport</span><span class="p">);</span> +<div class="codehilite"><pre> <span class="n">std</span><span class="o">::</span><span class="n">shared_ptr</span><span class="o"><</span><span class="n">TSocket</span><span class="o">></span> <span class="n">sock</span> <span class="o">=</span> <span class="n">std</span><span class="o">::</span><span class="n">dynamic_pointer_cast</span><span class="o"><</span><span class="n">TSocket</span><span class="o">></span><span class="p">(</span><span class="n">connInfo</span><span class="p">.</span><span class="n">transport</span><span class="p">);</span> <span class="n">cout</span> <span class="o"><<</span> <span class="s">"Incoming connection</span><span class="se">\n</span><span class="s">"</span><span class="p">;</span> <span class="n">cout</span> <span class="o"><<</span> <span class="s">"</span><span class="se">\t</span><span class="s">SocketInfo: "</span> <span class="o"><<</span> <span class="n">sock</span><span class="o">-></span><span class="n">getSocketInfo</span><span class="p">()</span> <span class="o"><<</span> <span class="s">"</span><span class="se">\n</span><span class="s">"</span><span class="p">;</span> <span class="n">cout</span> <span class="o"><<</span> <span class="s">"</span><span class="se">\t</span><span class="s">PeerHost: "</span> <span class="o"><<</span> <span class="n">sock</span><span class="o">-></span><span class="n">getPeerHost</span><span class="p">()</span> <span class="o"><<</span> <span class="s">"</span><span class="se">\n</span><span class="s">"</span><span class="p">;</span>