diff options
author | Dmitriy Ivanov <dimitry@google.com> | 2014-09-05 14:57:59 -0700 |
---|---|---|
committer | Dmitriy Ivanov <dimitry@google.com> | 2014-09-05 16:27:54 -0700 |
commit | 498eb18b82a425f9f30132e4832f327b2ee0e545 (patch) | |
tree | 08ae8d60c8f659139aba906ccfe6df4bc85afdb5 /libc/private | |
parent | b3ebfecdae05e29062bf4d0234239a54a2733ce0 (diff) | |
download | android_bionic-498eb18b82a425f9f30132e4832f327b2ee0e545.tar.gz android_bionic-498eb18b82a425f9f30132e4832f327b2ee0e545.tar.bz2 android_bionic-498eb18b82a425f9f30132e4832f327b2ee0e545.zip |
Revert "Load libraries in breadth-first order"
This reverts commit a3ad450a2e3fb6b3fe359683b247eba20896f646.
Change-Id: Ia2b838ad2159c643b80c514849582f4b4f4f40e5
Diffstat (limited to 'libc/private')
-rw-r--r-- | libc/private/UniquePtr.h | 140 |
1 files changed, 0 insertions, 140 deletions
diff --git a/libc/private/UniquePtr.h b/libc/private/UniquePtr.h deleted file mode 100644 index 5ac7599a0..000000000 --- a/libc/private/UniquePtr.h +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef UNIQUE_PTR_H_included -#define UNIQUE_PTR_H_included - -// Default deleter for pointer types. -template <typename T> -struct DefaultDelete { - enum { type_must_be_complete = sizeof(T) }; - DefaultDelete() {} - void operator()(T* p) const { - delete p; - } -}; - -// Default deleter for array types. -template <typename T> -struct DefaultDelete<T[]> { - enum { type_must_be_complete = sizeof(T) }; - void operator()(T* p) const { - delete[] p; - } -}; - -// A smart pointer that deletes the given pointer on destruction. -// Equivalent to C++0x's std::unique_ptr (a combination of boost::scoped_ptr -// and boost::scoped_array). -// Named to be in keeping with Android style but also to avoid -// collision with any other implementation, until we can switch over -// to unique_ptr. -// Use thus: -// UniquePtr<C> c(new C); -template <typename T, typename D = DefaultDelete<T> > -class UniquePtr { -public: - // Construct a new UniquePtr, taking ownership of the given raw pointer. - explicit UniquePtr(T* ptr = nullptr) : mPtr(ptr) { } - - UniquePtr(UniquePtr<T, D>&& that) { - mPtr = that.mPtr; - that.mPtr = nullptr; - } - - ~UniquePtr() { - reset(); - } - - // Accessors. - T& operator*() const { return *mPtr; } - T* operator->() const { return mPtr; } - T* get() const { return mPtr; } - - // Returns the raw pointer and hands over ownership to the caller. - // The pointer will not be deleted by UniquePtr. - T* release() __attribute__((warn_unused_result)) { - T* result = mPtr; - mPtr = nullptr; - return result; - } - - // Takes ownership of the given raw pointer. - // If this smart pointer previously owned a different raw pointer, that - // raw pointer will be freed. - void reset(T* ptr = nullptr) { - if (ptr != mPtr) { - D()(mPtr); - mPtr = ptr; - } - } - -private: - // The raw pointer. - T* mPtr; - - // Comparing unique pointers is probably a mistake, since they're unique. - template <typename T2> bool operator==(const UniquePtr<T2>& p) const = delete; - template <typename T2> bool operator!=(const UniquePtr<T2>& p) const = delete; - - // Disallow copy and assignment. - UniquePtr(const UniquePtr&) = delete; - void operator=(const UniquePtr&) = delete; -}; - -// Partial specialization for array types. Like std::unique_ptr, this removes -// operator* and operator-> but adds operator[]. -template <typename T, typename D> -class UniquePtr<T[], D> { -public: - explicit UniquePtr(T* ptr = NULL) : mPtr(ptr) { - } - UniquePtr(UniquePtr<T, D>&& that) { - mPtr = that.mPtr; - that.mPtr = nullptr; - } - - ~UniquePtr() { - reset(); - } - - T& operator[](size_t i) const { - return mPtr[i]; - } - T* get() const { return mPtr; } - - T* release() __attribute__((warn_unused_result)) { - T* result = mPtr; - mPtr = NULL; - return result; - } - - void reset(T* ptr = NULL) { - if (ptr != mPtr) { - D()(mPtr); - mPtr = ptr; - } - } - -private: - T* mPtr; - - // Disallow copy and assignment. - UniquePtr(const UniquePtr&) = delete; - void operator=(const UniquePtr&) = delete; -}; - -#endif // UNIQUE_PTR_H_included |