Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: src/base/smart-pointers.h

Issue 2175233003: Replace SmartPointer<T> with unique_ptr<T> (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@smart-array
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/base/smart-pointers.h
diff --git a/src/base/smart-pointers.h b/src/base/smart-pointers.h
deleted file mode 100644
index adda5a64e81d1d5bddf55c5ed6f93ac28f1039a5..0000000000000000000000000000000000000000
--- a/src/base/smart-pointers.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2011 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef V8_BASE_SMART_POINTERS_H_
-#define V8_BASE_SMART_POINTERS_H_
-
-#include "src/base/logging.h"
-
-namespace v8 {
-namespace base {
-
-template <typename Deallocator, typename T>
-class SmartPointerBase {
- public:
- // Default constructor. Constructs an empty scoped pointer.
- SmartPointerBase() : p_(NULL) {}
-
- // Constructs a scoped pointer from a plain one.
- explicit SmartPointerBase(T* ptr) : p_(ptr) {}
-
- // Copy constructor removes the pointer from the original to avoid double
- // freeing.
- SmartPointerBase(const SmartPointerBase<Deallocator, T>& rhs) : p_(rhs.p_) {
- const_cast<SmartPointerBase<Deallocator, T>&>(rhs).p_ = NULL;
- }
-
- T* operator->() const { return p_; }
-
- T& operator*() const { return *p_; }
-
- T* get() const { return p_; }
-
- // You can use [n] to index as if it was a plain pointer.
- T& operator[](size_t i) { return p_[i]; }
-
- // You can use [n] to index as if it was a plain pointer.
- const T& operator[](size_t i) const { return p_[i]; }
-
- // We don't have implicit conversion to a T* since that hinders migration:
- // You would not be able to change a method from returning a T* to
- // returning an SmartArrayPointer<T> and then get errors wherever it is used.
-
-
- // If you want to take out the plain pointer and don't want it automatically
- // deleted then call Detach(). Afterwards, the smart pointer is empty
- // (NULL).
- T* Detach() {
- T* temp = p_;
- p_ = NULL;
- return temp;
- }
-
- void Reset(T* new_value) {
- DCHECK(p_ == NULL || p_ != new_value);
- if (p_) Deallocator::Delete(p_);
- p_ = new_value;
- }
-
- // Assignment requires an empty (NULL) SmartArrayPointer as the receiver. Like
- // the copy constructor it removes the pointer in the original to avoid
- // double freeing.
- SmartPointerBase<Deallocator, T>& operator=(
- const SmartPointerBase<Deallocator, T>& rhs) {
- DCHECK(is_empty());
- T* tmp = rhs.p_; // swap to handle self-assignment
- const_cast<SmartPointerBase<Deallocator, T>&>(rhs).p_ = NULL;
- p_ = tmp;
- return *this;
- }
-
- bool is_empty() const { return p_ == NULL; }
-
- protected:
- // When the destructor of the scoped pointer is executed the plain pointer
- // is deleted using DeleteArray. This implies that you must allocate with
- // NewArray.
- ~SmartPointerBase() {
- if (p_) Deallocator::Delete(p_);
- }
-
- private:
- T* p_;
-};
-
-template <typename T>
-struct ObjectDeallocator {
- static void Delete(T* object) { delete object; }
-};
-
-template <typename T>
-class SmartPointer : public SmartPointerBase<ObjectDeallocator<T>, T> {
- public:
- SmartPointer() {}
- explicit SmartPointer(T* ptr)
- : SmartPointerBase<ObjectDeallocator<T>, T>(ptr) {}
- SmartPointer(const SmartPointer<T>& rhs)
- : SmartPointerBase<ObjectDeallocator<T>, T>(rhs) {}
-};
-
-} // namespace base
-} // namespace v8
-
-#endif // V8_SMART_POINTERS_H_

Powered by Google App Engine
This is Rietveld 408576698