trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject git commit: Fixing small issue with cppapi and shared_ptr
Date Fri, 03 Oct 2014 23:19:53 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 510fe9e2b -> b53c82d41


Fixing small issue with cppapi and shared_ptr


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b53c82d4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b53c82d4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b53c82d4

Branch: refs/heads/master
Commit: b53c82d411447af679873975bead5ad79f2f4ed2
Parents: 510fe9e
Author: Brian Geffon <briang@apache.org>
Authored: Tue Sep 30 02:08:01 2014 -0700
Committer: Brian Geffon <briang@apache.org>
Committed: Tue Sep 30 02:08:01 2014 -0700

----------------------------------------------------------------------
 .../src/include/atscppapi/shared_ptr.h          | 21 ++------------------
 1 file changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b53c82d4/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 6fa9571..014aae9 100644
--- a/lib/atscppapi/src/include/atscppapi/shared_ptr.h
+++ b/lib/atscppapi/src/include/atscppapi/shared_ptr.h
@@ -25,27 +25,10 @@
 #ifndef ASTCPPAPI_SHARED_PTR_H_
 #define ASTCPPAPI_SHARED_PTR_H_
 
-#include "ink_autoconf.h"
-
-#if HAVE_STD_SHARED_PTR
-#  include <memory>
-#else
-#  include <tr1/memory>
-#endif
+#include <memory>
 
 namespace atscppapi {
-
-/**
- * Force the use of std::tr1::shared_ptr
- * \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
- */
-#if HAVE_STD_SHARED_PTR
-  using std::shared_ptr;
-#else
-  using std::tr1::shared_ptr;
-#endif
-
+using std::shared_ptr;
 } /* atscppapi */
 
 #endif /* SHARED_PTR_H_ */


Mime
View raw message