Updated Branches: refs/heads/master 60ec95053 -> 99999bdd2
TS-2551 Eliminate the tr1 dependency from CPP APIs Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/99999bdd Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/99999bdd Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/99999bdd Branch: refs/heads/master Commit: 99999bdd26bde9eed05a88eb60f1c73bf52daf5c Parents: 60ec950 Author: Leif Hedstrom <[email protected]> Authored: Mon Feb 3 12:56:53 2014 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Mon Feb 3 12:56:53 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ lib/atscppapi/src/include/atscppapi/shared_ptr.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/99999bdd/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index fab65c0..b733352 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.0 + *) [TS-2551] Eliminate the tr1 dependency from CPP APIs. + *) [TS-2541] Add WebSocket support *) [TS-2550] Add inline configuration overrised to the conf_remap plugin. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/99999bdd/lib/atscppapi/src/include/atscppapi/shared_ptr.h ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/include/atscppapi/shared_ptr.h b/lib/atscppapi/src/include/atscppapi/shared_ptr.h index 3207405..5a826db 100644 --- a/lib/atscppapi/src/include/atscppapi/shared_ptr.h +++ b/lib/atscppapi/src/include/atscppapi/shared_ptr.h @@ -25,7 +25,7 @@ #ifndef ASTCPPAPI_SHARED_PTR_H_ #define ASTCPPAPI_SHARED_PTR_H_ -#include <tr1/memory> +#include <memory> namespace atscppapi { @@ -34,7 +34,7 @@ namespace atscppapi { * \todo Consider adding a simple macro to check if c++0x/11 is enabled * and if so change it to std::shared_ptr and #include <memory>s */ -using std::tr1::shared_ptr; +using std::shared_ptr; } /* atscppapi */
