Repository: trafficserver Updated Branches: refs/heads/5.3.x b97d7292f -> fa1a02fa3
TS-4227: Remove auto_ptr in SPDY plugin Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fa1a02fa Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fa1a02fa Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fa1a02fa Branch: refs/heads/5.3.x Commit: fa1a02fa3a2fd3fa8ca74d1cab5c7367503038e3 Parents: b97d729 Author: Phil Sorber <[email protected]> Authored: Wed Feb 24 15:35:43 2016 -0700 Committer: Phil Sorber <[email protected]> Committed: Wed Feb 24 15:39:22 2016 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ plugins/experimental/spdy/io.cc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fa1a02fa/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 8beb1c9..8d77bba 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.3.3 + *) [TS-4227] Remove auto_ptr in SPDY plugin. + *) [TS-3634] Replace auto_ptr with ats_scoped_object. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fa1a02fa/plugins/experimental/spdy/io.cc ---------------------------------------------------------------------- diff --git a/plugins/experimental/spdy/io.cc b/plugins/experimental/spdy/io.cc index 2329bdc..d387b89 100644 --- a/plugins/experimental/spdy/io.cc +++ b/plugins/experimental/spdy/io.cc @@ -19,7 +19,7 @@ #include <ts/ts.h> #include <spdy/spdy.h> #include "io.h" -#include <memory> +#include "ink_memory.h" spdy_io_control::spdy_io_control(TSVConn v) : vconn(v), input(), output(), streams(), last_stream_id(0) { @@ -60,7 +60,7 @@ spdy_io_control::valid_client_stream_id(unsigned stream_id) const spdy_io_stream * spdy_io_control::create_stream(unsigned stream_id) { - std::auto_ptr<spdy_io_stream> ptr(new spdy_io_stream(stream_id)); + ats_scoped_obj<spdy_io_stream> ptr(new spdy_io_stream(stream_id)); std::pair<stream_map_type::iterator, bool> result; result = streams.insert(std::make_pair(stream_id, ptr.get()));
