From f727bc94432905d79af23cf0aef14854965da2cd Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Fri, 4 Feb 2022 09:46:55 -0500 Subject: PointerHolder: add get() and use_count() for forward compatibility PointerHolder will be replaced with shared_ptr, so let people start moving. --- libtests/pointer_holder.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'libtests/pointer_holder.cc') diff --git a/libtests/pointer_holder.cc b/libtests/pointer_holder.cc index 469bfc21..913449e4 100644 --- a/libtests/pointer_holder.cc +++ b/libtests/pointer_holder.cc @@ -4,8 +4,6 @@ #include #include -#include - class Object { public: @@ -47,13 +45,20 @@ Object::hello() const typedef PointerHolder ObjectHolder; -void callHello(ObjectHolder const& oh) +void callHello(ObjectHolder& oh) { oh.getPointer()->hello(); oh->hello(); (*oh).hello(); } +void callHelloWithGet(ObjectHolder const& oh) +{ + oh.get()->hello(); + oh->hello(); + (*oh).hello(); +} + int main(int argc, char* argv[]) { std::list ol1; @@ -66,7 +71,7 @@ int main(int argc, char* argv[]) std::cout << "oh1 refcount = " << oh1.getRefcount() << std::endl; ObjectHolder oh2(oh1); std::cout << "oh1 refcount = " << oh1.getRefcount() << std::endl; - std::cout << "oh2 refcount = " << oh2.getRefcount() << std::endl; + std::cout << "oh2 refcount = " << oh2.use_count() << std::endl; ObjectHolder oh3(new Object); ObjectHolder oh4; ObjectHolder oh5; @@ -89,12 +94,15 @@ int main(int argc, char* argv[]) ol1.push_back(oh3); Object* o3 = new Object; oh0 = o3; + PointerHolder oh6(new Object()); + oh6->hello(); } ol1.front().getPointer()->hello(); ol1.front()->hello(); (*ol1.front()).hello(); callHello(ol1.front()); + callHelloWithGet(ol1.front()); ol1.pop_front(); std::cout << "array" << std::endl; PointerHolder oarr1_ph(true, new Object[2]); -- cgit v1.2.3-54-g00ecf