From 4e67ab6663f8f4960a1078546906746877f87e1a Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Thu, 16 Oct 2014 05:49:45 -0400 Subject: dev: Use shared_ptr for Arguments::Data This patch takes a first few steps in transitioning from the ad-hoc RefCountingPtr to the c++11 shared_ptr. There are no changes in behaviour, and the code modifications are mainly introducing the use of make_shared. Note that the class could use unique_ptr rather than shared_ptr, was it not for the postfix increment and decrement operators. --- src/sim/arguments.hh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/sim') diff --git a/src/sim/arguments.hh b/src/sim/arguments.hh index 58a43852c..165880095 100644 --- a/src/sim/arguments.hh +++ b/src/sim/arguments.hh @@ -32,8 +32,8 @@ #define __SIM_ARGUMENTS_HH__ #include +#include -#include "base/refcnt.hh" #include "base/types.hh" #include "mem/fs_translating_port_proxy.hh" @@ -47,7 +47,7 @@ class Arguments uint64_t getArg(uint16_t size = (uint16_t)(-1), bool fp = false); protected: - class Data : public RefCounted + class Data { public: Data(){} @@ -60,12 +60,12 @@ class Arguments char *alloc(size_t size); }; - RefCountingPtr data; + std::shared_ptr data; public: Arguments(ThreadContext *ctx, int n = 0) - : tc(ctx), number(n), data(NULL) - { assert(number >= 0); data = new Data;} + : tc(ctx), number(n), data(new Data()) + { assert(number >= 0); } Arguments(const Arguments &args) : tc(args.tc), number(args.number), data(args.data) {} ~Arguments() {} @@ -73,9 +73,11 @@ class Arguments ThreadContext *getThreadContext() const { return tc; } const Arguments &operator=(const Arguments &args) { - tc = args.tc; - number = args.number; - data = args.data; + if (this != &args) { + tc = args.tc; + number = args.number; + data = args.data; + } return *this; } -- cgit v1.2.3