X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FADT%2FOwningPtr.h;h=cc53c8c30c1216c8bdaad394ab6a147c989117a0;hb=7c718222cdb624f4c420b3d7b6eeb12fffc05603;hp=95d7db17b9128bf01f8b3b129222db8cc913ec0d;hpb=faa999565f15e70630c09bd75002408d3cc7ff66;p=oota-llvm.git diff --git a/include/llvm/ADT/OwningPtr.h b/include/llvm/ADT/OwningPtr.h index 95d7db17b91..cc53c8c30c1 100644 --- a/include/llvm/ADT/OwningPtr.h +++ b/include/llvm/ADT/OwningPtr.h @@ -23,10 +23,10 @@ namespace llvm { /// guarantees deletion of the object pointed to, either on destruction of the /// OwningPtr or via an explicit reset(). Once created, ownership of the /// pointee object can be taken away from OwningPtr by using the take method. -template +template class OwningPtr { OwningPtr(OwningPtr const &); // DO NOT IMPLEMENT - OwningPtr &operator=(OwningPtr const &); // DO NOT IMPLEMENT + OwningPtr &operator=(OwningPtr const &); // DO NOT IMPLEMENT T *Ptr; public: explicit OwningPtr(T *P = 0) : Ptr(P) {} @@ -38,7 +38,7 @@ public: /// reset - Change the current pointee to the specified pointer. Note that /// calling this with any pointer (including a null pointer) deletes the /// current pointer. - void reset(T *P = 0) { + void reset(T *P = 0) { if (P == Ptr) return; T *Tmp = Ptr; Ptr = P; @@ -47,12 +47,12 @@ public: /// take - Reset the owning pointer to null and return its pointer. This does /// not delete the pointer before returning it. - T *take() { + T *take() { T *Tmp = Ptr; Ptr = 0; return Tmp; } - + T &operator*() const { assert(Ptr && "Cannot dereference null pointer"); return *Ptr; @@ -77,7 +77,7 @@ inline void swap(OwningPtr &a, OwningPtr &b) { /// OwningArrayPtr smart pointer - OwningArrayPtr provides the same /// functionality as OwningPtr, except that it works for array types. -template +template class OwningArrayPtr { OwningArrayPtr(OwningArrayPtr const &); // DO NOT IMPLEMENT OwningArrayPtr &operator=(OwningArrayPtr const &); // DO NOT IMPLEMENT @@ -92,26 +92,26 @@ public: /// reset - Change the current pointee to the specified pointer. Note that /// calling this with any pointer (including a null pointer) deletes the /// current pointer. - void reset(T *P = 0) { + void reset(T *P = 0) { if (P == Ptr) return; T *Tmp = Ptr; Ptr = P; - delete Tmp; + delete [] Tmp; } /// take - Reset the owning pointer to null and return its pointer. This does /// not delete the pointer before returning it. - T *take() { + T *take() { T *Tmp = Ptr; Ptr = 0; return Tmp; } - + T &operator[](std::ptrdiff_t i) const { assert(Ptr && "Cannot dereference null pointer"); return Ptr[i]; } - + T *get() const { return Ptr; } operator bool() const { return Ptr != 0; } bool operator!() const { return Ptr == 0; }