diff options
71 files changed, 112 insertions, 69 deletions
diff --git a/build/Android.libcxx.mk b/build/Android.libcxx.mk index 3dd1eb7473..f84e9573a9 100644 --- a/build/Android.libcxx.mk +++ b/build/Android.libcxx.mk @@ -14,7 +14,10 @@ # limitations under the License. # +LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.libcxx.mk + ifneq ($(LOCAL_IS_HOST_MODULE),true) include external/stlport/libstlport.mk + LOCAL_CFLAGS += -DART_WITH_STLPORT=1 # include external/libcxx/libcxx.mk endif diff --git a/compiler/compiled_method.h b/compiler/compiled_method.h index 844b53c065..c3c9961e70 100644 --- a/compiler/compiled_method.h +++ b/compiler/compiled_method.h @@ -22,7 +22,7 @@ #include "instruction_set.h" #include "utils.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace llvm { class Function; diff --git a/compiler/dex/local_value_numbering.h b/compiler/dex/local_value_numbering.h index 6d67afb862..7049f8cf2c 100644 --- a/compiler/dex/local_value_numbering.h +++ b/compiler/dex/local_value_numbering.h @@ -18,7 +18,7 @@ #define ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_ #include "compiler_internals.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utils/scoped_arena_allocator.h" #include "utils/scoped_arena_containers.h" diff --git a/compiler/dex/mir_analysis.cc b/compiler/dex/mir_analysis.cc index c3b5a2585f..1c9e2e2127 100644 --- a/compiler/dex/mir_analysis.cc +++ b/compiler/dex/mir_analysis.cc @@ -23,7 +23,7 @@ #include "dex/quick/dex_file_method_inliner.h" #include "dex/quick/dex_file_to_method_inliner_map.h" #include "driver/compiler_options.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utils/scoped_arena_containers.h" namespace art { diff --git a/compiler/dex/verified_method.cc b/compiler/dex/verified_method.cc index 0f812a49cd..e19f3cf237 100644 --- a/compiler/dex/verified_method.cc +++ b/compiler/dex/verified_method.cc @@ -34,7 +34,7 @@ #include "mirror/dex_cache-inl.h" #include "mirror/object.h" #include "mirror/object-inl.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "verifier/dex_gc_map.h" #include "verifier/method_verifier.h" #include "verifier/method_verifier-inl.h" diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 113594a0d4..fe3a4e62b0 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -19,7 +19,7 @@ #include <stdint.h> #include <stdio.h> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "class_linker.h" #include "common_compiler_test.h" #include "dex_file.h" diff --git a/compiler/elf_fixup.cc b/compiler/elf_fixup.cc index 6fd4a7302a..571a091c8e 100644 --- a/compiler/elf_fixup.cc +++ b/compiler/elf_fixup.cc @@ -22,7 +22,7 @@ #include "base/stringprintf.h" #include "elf_file.h" #include "elf_writer.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/compiler/elf_stripper.cc b/compiler/elf_stripper.cc index 42291b2c7a..b0fa63ccb5 100644 --- a/compiler/elf_stripper.cc +++ b/compiler/elf_stripper.cc @@ -20,7 +20,7 @@ #include <sys/types.h> #include <vector> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "base/logging.h" #include "elf_file.h" #include "elf_utils.h" diff --git a/compiler/elf_writer_mclinker.h b/compiler/elf_writer_mclinker.h index 13757edecd..3c1a47b001 100644 --- a/compiler/elf_writer_mclinker.h +++ b/compiler/elf_writer_mclinker.h @@ -19,7 +19,7 @@ #include "elf_writer.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "safe_map.h" namespace mcld { diff --git a/compiler/image_test.cc b/compiler/image_test.cc index 7c5741bb23..5a79542615 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -27,7 +27,7 @@ #include "lock_word.h" #include "mirror/object-inl.h" #include "signal_catcher.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utils.h" #include "vector_output_stream.h" diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc index d855eee441..20a66d4022 100644 --- a/compiler/image_writer.cc +++ b/compiler/image_writer.cc @@ -52,7 +52,7 @@ #include "runtime.h" #include "scoped_thread_state_change.h" #include "handle_scope-inl.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utils.h" using ::art::mirror::ArtField; diff --git a/compiler/image_writer.h b/compiler/image_writer.h index 7e22a960e1..f8df2bbd8c 100644 --- a/compiler/image_writer.h +++ b/compiler/image_writer.h @@ -30,7 +30,7 @@ #include "os.h" #include "safe_map.h" #include "gc/space/space.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc index 6035689f88..561d00fac0 100644 --- a/compiler/jni/jni_compiler_test.cc +++ b/compiler/jni/jni_compiler_test.cc @@ -31,7 +31,7 @@ #include "ScopedLocalRef.h" #include "scoped_thread_state_change.h" #include "thread.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" extern "C" JNIEXPORT jint JNICALL Java_MyClassNatives_bar(JNIEnv*, jobject, jint count) { return count + 1; diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index 20f9f4b0d8..02d6fa5489 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -33,7 +33,7 @@ #include "utils/mips/managed_register_mips.h" #include "utils/x86/managed_register_x86.h" #include "thread.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #define __ jni_asm-> diff --git a/compiler/oat_writer.h b/compiler/oat_writer.h index 85c9b4761a..7a41d87423 100644 --- a/compiler/oat_writer.h +++ b/compiler/oat_writer.h @@ -26,7 +26,7 @@ #include "oat.h" #include "mirror/class.h" #include "safe_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/compiler/utils/arm64/assembler_arm64.h b/compiler/utils/arm64/assembler_arm64.h index c866b29224..0f4a9a44e7 100644 --- a/compiler/utils/arm64/assembler_arm64.h +++ b/compiler/utils/arm64/assembler_arm64.h @@ -26,7 +26,7 @@ #include "utils/assembler.h" #include "offsets.h" #include "utils.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "a64/macro-assembler-a64.h" #include "a64/disasm-a64.h" diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index e99c76f612..8076b61260 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) -dalvikvm_cflags := -Wall -Werror -Wextra +dalvikvm_cflags := -Wall -Werror -Wextra -std=gnu++11 include $(CLEAR_VARS) LOCAL_MODULE := dalvikvm @@ -24,6 +24,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := cc LOCAL_SRC_FILES := dalvikvm.cc LOCAL_CFLAGS := $(dalvikvm_cflags) +LOCAL_C_INCLUDES := art/runtime LOCAL_SHARED_LIBRARIES := libdl libnativehelper LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MULTILIB := both @@ -37,9 +38,11 @@ ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_MODULE := dalvikvm LOCAL_MODULE_TAGS := optional +LOCAL_CLANG := true LOCAL_CPP_EXTENSION := cc LOCAL_SRC_FILES := dalvikvm.cc LOCAL_CFLAGS := $(dalvikvm_cflags) +LOCAL_C_INCLUDES := art/runtime LOCAL_SHARED_LIBRARIES := libnativehelper LOCAL_LDFLAGS := -ldl -lpthread LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk diff --git a/dalvikvm/dalvikvm.cc b/dalvikvm/dalvikvm.cc index 8d71a7ca67..582adc06d2 100644 --- a/dalvikvm/dalvikvm.cc +++ b/dalvikvm/dalvikvm.cc @@ -24,7 +24,7 @@ #include "JniInvocation.h" #include "ScopedLocalRef.h" #include "toStringArray.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/UniquePtrCompat.h b/runtime/UniquePtrCompat.h new file mode 100644 index 0000000000..4a45616de4 --- /dev/null +++ b/runtime/UniquePtrCompat.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2014 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 ART_RUNTIME_UNIQUEPTRCOMPAT_H_ +#define ART_RUNTIME_UNIQUEPTRCOMPAT_H_ + +// Stlport doesn't declare std::unique_ptr. UniquePtr.h declares an incompatible std::swap +// prototype with libc++. This compatibility header file resolves differences between the two, in +// the future UniquePtr will become std::unique_ptr. + +#ifdef ART_WITH_STLPORT + +#include "UniquePtr.h" + +#else // ART_WITH_STLPORT + +#include <memory> + +template <typename T> +using UniquePtr = typename std::unique_ptr<T>; + +#endif // ART_WITH_STLPORT + +#endif // ART_RUNTIME_UNIQUEPTRCOMPAT_H_ diff --git a/runtime/barrier.h b/runtime/barrier.h index 0c7fd87a79..d3e6bae82f 100644 --- a/runtime/barrier.h +++ b/runtime/barrier.h @@ -18,7 +18,7 @@ #define ART_RUNTIME_BARRIER_H_ #include "base/mutex.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/barrier_test.cc b/runtime/barrier_test.cc index 7d323380e3..a02c4c7d03 100644 --- a/runtime/barrier_test.cc +++ b/runtime/barrier_test.cc @@ -22,7 +22,7 @@ #include "common_runtime_test.h" #include "mirror/object_array-inl.h" #include "thread_pool.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { class CheckWaitTask : public Task { diff --git a/runtime/base/bit_vector_test.cc b/runtime/base/bit_vector_test.cc index 2ff55cbb3e..990d1dbeac 100644 --- a/runtime/base/bit_vector_test.cc +++ b/runtime/base/bit_vector_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "bit_vector.h" #include "gtest/gtest.h" diff --git a/runtime/base/histogram_test.cc b/runtime/base/histogram_test.cc index 966b97f3b0..d72ae47250 100644 --- a/runtime/base/histogram_test.cc +++ b/runtime/base/histogram_test.cc @@ -16,7 +16,7 @@ #include "gtest/gtest.h" #include "histogram-inl.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include <sstream> diff --git a/runtime/base/logging.cc b/runtime/base/logging.cc index 730a2c2cb4..b6c6b9b2df 100644 --- a/runtime/base/logging.cc +++ b/runtime/base/logging.cc @@ -19,7 +19,7 @@ #include "base/mutex.h" #include "runtime.h" #include "thread-inl.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utils.h" namespace art { diff --git a/runtime/base/logging.h b/runtime/base/logging.h index 6944278da4..7800cfe80a 100644 --- a/runtime/base/logging.h +++ b/runtime/base/logging.h @@ -25,7 +25,7 @@ #include <vector> #include "base/macros.h" #include "log_severity.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #define CHECK(x) \ if (UNLIKELY(!(x))) \ diff --git a/runtime/base/unix_file/random_access_file_test.h b/runtime/base/unix_file/random_access_file_test.h index 8a6605e58f..67e8c229f9 100644 --- a/runtime/base/unix_file/random_access_file_test.h +++ b/runtime/base/unix_file/random_access_file_test.h @@ -22,7 +22,7 @@ #include <string> #include "common_runtime_test.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace unix_file { diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 9034560689..c7f3a20ee3 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -62,7 +62,7 @@ #include "scoped_thread_state_change.h" #include "handle_scope-inl.h" #include "thread.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utils.h" #include "verifier/method_verifier.h" #include "well_known_classes.h" diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 0db08aa1ab..9970dd5081 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -18,7 +18,7 @@ #include <string> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "class_linker-inl.h" #include "common_runtime_test.h" #include "dex_file.h" diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index 79d36901df..d7a166719a 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -47,7 +47,7 @@ #include "ScopedLocalRef.h" #include "thread.h" #include "utils.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "verifier/method_verifier.h" #include "verifier/method_verifier-inl.h" #include "well_known_classes.h" diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc index f3d46218c2..26b7d07bbf 100644 --- a/runtime/dex_file.cc +++ b/runtime/dex_file.cc @@ -39,7 +39,7 @@ #include "ScopedFd.h" #include "handle_scope-inl.h" #include "thread.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utf-inl.h" #include "utils.h" #include "well_known_classes.h" diff --git a/runtime/dex_file.h b/runtime/dex_file.h index cfa255589f..0146f316a7 100644 --- a/runtime/dex_file.h +++ b/runtime/dex_file.h @@ -28,7 +28,7 @@ #include "mem_map.h" #include "modifiers.h" #include "safe_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/dex_file_test.cc b/runtime/dex_file_test.cc index 9b6859a924..86c282e894 100644 --- a/runtime/dex_file_test.cc +++ b/runtime/dex_file_test.cc @@ -16,7 +16,7 @@ #include "dex_file.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "common_runtime_test.h" namespace art { diff --git a/runtime/dex_file_verifier.cc b/runtime/dex_file_verifier.cc index 528e112542..d179c8b2aa 100644 --- a/runtime/dex_file_verifier.cc +++ b/runtime/dex_file_verifier.cc @@ -22,7 +22,7 @@ #include "dex_file-inl.h" #include "leb128.h" #include "safe_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utf-inl.h" #include "utils.h" diff --git a/runtime/dex_instruction_visitor_test.cc b/runtime/dex_instruction_visitor_test.cc index 8f42b0c9a4..99ad3ed328 100644 --- a/runtime/dex_instruction_visitor_test.cc +++ b/runtime/dex_instruction_visitor_test.cc @@ -18,7 +18,7 @@ #include <iostream> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "gtest/gtest.h" namespace art { diff --git a/runtime/elf_file.h b/runtime/elf_file.h index d2a044e9cf..138147b03f 100644 --- a/runtime/elf_file.h +++ b/runtime/elf_file.h @@ -25,7 +25,7 @@ #include "elf_utils.h" #include "mem_map.h" #include "os.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/exception_test.cc b/runtime/exception_test.cc index 91a0176381..37ad9e51aa 100644 --- a/runtime/exception_test.cc +++ b/runtime/exception_test.cc @@ -27,7 +27,7 @@ #include "scoped_thread_state_change.h" #include "handle_scope-inl.h" #include "thread.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "vmap_table.h" namespace art { diff --git a/runtime/gc/accounting/atomic_stack.h b/runtime/gc/accounting/atomic_stack.h index c79b5860d4..7d8b584fc9 100644 --- a/runtime/gc/accounting/atomic_stack.h +++ b/runtime/gc/accounting/atomic_stack.h @@ -23,7 +23,7 @@ #include "atomic.h" #include "base/logging.h" #include "base/macros.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "mem_map.h" #include "utils.h" diff --git a/runtime/gc/accounting/card_table.h b/runtime/gc/accounting/card_table.h index 8d5dc078d8..17e62a6153 100644 --- a/runtime/gc/accounting/card_table.h +++ b/runtime/gc/accounting/card_table.h @@ -20,7 +20,7 @@ #include "base/mutex.h" #include "globals.h" #include "mem_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/gc/accounting/mod_union_table.cc b/runtime/gc/accounting/mod_union_table.cc index 7cddaf46cb..ef5653a3bf 100644 --- a/runtime/gc/accounting/mod_union_table.cc +++ b/runtime/gc/accounting/mod_union_table.cc @@ -30,7 +30,7 @@ #include "mirror/object_array-inl.h" #include "space_bitmap-inl.h" #include "thread.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" using ::art::mirror::Object; diff --git a/runtime/gc/accounting/remembered_set.cc b/runtime/gc/accounting/remembered_set.cc index bbbd1ed055..1def334a48 100644 --- a/runtime/gc/accounting/remembered_set.cc +++ b/runtime/gc/accounting/remembered_set.cc @@ -30,7 +30,7 @@ #include "mirror/object_array-inl.h" #include "space_bitmap-inl.h" #include "thread.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { namespace gc { diff --git a/runtime/gc/accounting/space_bitmap-inl.h b/runtime/gc/accounting/space_bitmap-inl.h index 646fce6504..a4394622e8 100644 --- a/runtime/gc/accounting/space_bitmap-inl.h +++ b/runtime/gc/accounting/space_bitmap-inl.h @@ -28,7 +28,7 @@ #include "mirror/object_array-inl.h" #include "object_utils.h" #include "space_bitmap-inl.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utils.h" namespace art { diff --git a/runtime/gc/accounting/space_bitmap.h b/runtime/gc/accounting/space_bitmap.h index a805809070..1ccebf53d9 100644 --- a/runtime/gc/accounting/space_bitmap.h +++ b/runtime/gc/accounting/space_bitmap.h @@ -22,7 +22,7 @@ #include "globals.h" #include "mem_map.h" #include "object_callbacks.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include <limits.h> #include <set> diff --git a/runtime/gc/accounting/space_bitmap_test.cc b/runtime/gc/accounting/space_bitmap_test.cc index 972f94d6db..71db44bad2 100644 --- a/runtime/gc/accounting/space_bitmap_test.cc +++ b/runtime/gc/accounting/space_bitmap_test.cc @@ -21,7 +21,7 @@ #include "common_runtime_test.h" #include "globals.h" #include "space_bitmap-inl.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { namespace gc { diff --git a/runtime/gc/allocator/rosalloc.h b/runtime/gc/allocator/rosalloc.h index 8557f1bcad..9ea4306028 100644 --- a/runtime/gc/allocator/rosalloc.h +++ b/runtime/gc/allocator/rosalloc.h @@ -28,7 +28,7 @@ #include "base/logging.h" #include "globals.h" #include "mem_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utils.h" // Ensure we have an unordered_set until we have worked out C++ library issues. diff --git a/runtime/gc/collector/mark_sweep.h b/runtime/gc/collector/mark_sweep.h index cfb0b5e51c..fd79bf6a2d 100644 --- a/runtime/gc/collector/mark_sweep.h +++ b/runtime/gc/collector/mark_sweep.h @@ -26,7 +26,7 @@ #include "immune_region.h" #include "object_callbacks.h" #include "offsets.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/gc/collector/semi_space.h b/runtime/gc/collector/semi_space.h index 4b1ecc4083..dacb5ae76f 100644 --- a/runtime/gc/collector/semi_space.h +++ b/runtime/gc/collector/semi_space.h @@ -25,7 +25,7 @@ #include "immune_region.h" #include "object_callbacks.h" #include "offsets.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index 4642a9824a..b4c2d14f49 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -64,7 +64,7 @@ #include "scoped_thread_state_change.h" #include "handle_scope-inl.h" #include "thread_list.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "well_known_classes.h" namespace art { diff --git a/runtime/gc/space/large_object_space.cc b/runtime/gc/space/large_object_space.cc index 554fbbe9a5..6c851af603 100644 --- a/runtime/gc/space/large_object_space.cc +++ b/runtime/gc/space/large_object_space.cc @@ -20,7 +20,7 @@ #include "base/logging.h" #include "base/mutex-inl.h" #include "base/stl_util.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "image.h" #include "os.h" #include "space-inl.h" diff --git a/runtime/gc/space/space.h b/runtime/gc/space/space.h index dcf5357de7..343bc29b54 100644 --- a/runtime/gc/space/space.h +++ b/runtime/gc/space/space.h @@ -19,7 +19,7 @@ #include <string> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "base/macros.h" #include "base/mutex.h" #include "gc/accounting/space_bitmap.h" diff --git a/runtime/gc/space/space_test.h b/runtime/gc/space/space_test.h index ce101e4b63..407d362be7 100644 --- a/runtime/gc/space/space_test.h +++ b/runtime/gc/space/space_test.h @@ -23,7 +23,7 @@ #include "common_runtime_test.h" #include "globals.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "mirror/array-inl.h" #include "mirror/object-inl.h" diff --git a/runtime/intern_table.cc b/runtime/intern_table.cc index dfc82dd99b..2a8cc63b13 100644 --- a/runtime/intern_table.cc +++ b/runtime/intern_table.cc @@ -22,7 +22,7 @@ #include "mirror/object-inl.h" #include "mirror/string.h" #include "thread.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utf.h" namespace art { diff --git a/runtime/jdwp/jdwp_handler.cc b/runtime/jdwp/jdwp_handler.cc index 4843c2b5ec..00be016449 100644 --- a/runtime/jdwp/jdwp_handler.cc +++ b/runtime/jdwp/jdwp_handler.cc @@ -32,7 +32,7 @@ #include "jdwp/jdwp_priv.h" #include "runtime.h" #include "thread-inl.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index 21dab8d001..3afb149fa3 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -49,7 +49,7 @@ #include "ScopedLocalRef.h" #include "thread.h" #include "utf.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "well_known_classes.h" namespace art { diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc index 98b0bbf125..5225919b0c 100644 --- a/runtime/mem_map.cc +++ b/runtime/mem_map.cc @@ -19,7 +19,7 @@ #include <inttypes.h> #include <backtrace/BacktraceMap.h> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "base/stringprintf.h" #include "ScopedFd.h" #include "utils.h" diff --git a/runtime/mem_map_test.cc b/runtime/mem_map_test.cc index 2b59cd9a4a..b26f56374e 100644 --- a/runtime/mem_map_test.cc +++ b/runtime/mem_map_test.cc @@ -16,7 +16,7 @@ #include "mem_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "gtest/gtest.h" namespace art { diff --git a/runtime/mirror/object_test.cc b/runtime/mirror/object_test.cc index 537fe85565..e0fd6a229e 100644 --- a/runtime/mirror/object_test.cc +++ b/runtime/mirror/object_test.cc @@ -36,7 +36,7 @@ #include "object_array-inl.h" #include "handle_scope-inl.h" #include "string-inl.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { namespace mirror { diff --git a/runtime/os_linux.cc b/runtime/os_linux.cc index 7ce17e0aee..d9a5813f7a 100644 --- a/runtime/os_linux.cc +++ b/runtime/os_linux.cc @@ -23,7 +23,7 @@ #include "base/logging.h" #include "base/unix_file/fd_file.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/parsed_options_test.cc b/runtime/parsed_options_test.cc index 7f293cdb5a..39f7638d15 100644 --- a/runtime/parsed_options_test.cc +++ b/runtime/parsed_options_test.cc @@ -16,7 +16,7 @@ #include "parsed_options.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "common_runtime_test.h" namespace art { diff --git a/runtime/profiler.h b/runtime/profiler.h index 31fdc79288..bcd7c29793 100644 --- a/runtime/profiler.h +++ b/runtime/profiler.h @@ -29,7 +29,7 @@ #include "instrumentation.h" #include "os.h" #include "safe_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 78a93fd764..d183cba051 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -72,7 +72,7 @@ #include "trace.h" #include "transaction.h" #include "profiler.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "verifier/method_verifier.h" #include "well_known_classes.h" diff --git a/runtime/thread.h b/runtime/thread.h index 83f7b8eeef..be7634f8be 100644 --- a/runtime/thread.h +++ b/runtime/thread.h @@ -39,7 +39,7 @@ #include "stack.h" #include "thread_state.h" #include "throw_location.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/trace.h b/runtime/trace.h index bf4995a459..ef6c6427fb 100644 --- a/runtime/trace.h +++ b/runtime/trace.h @@ -27,7 +27,7 @@ #include "instrumentation.h" #include "os.h" #include "safe_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/utils.cc b/runtime/utils.cc index c332bdf815..f26b59896b 100644 --- a/runtime/utils.cc +++ b/runtime/utils.cc @@ -25,7 +25,7 @@ #include <unistd.h> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "base/stl_util.h" #include "base/unix_file/fd_file.h" #include "dex_file-inl.h" diff --git a/runtime/verifier/method_verifier.h b/runtime/verifier/method_verifier.h index cea24038cb..14200f755f 100644 --- a/runtime/verifier/method_verifier.h +++ b/runtime/verifier/method_verifier.h @@ -33,7 +33,7 @@ #include "reg_type_cache-inl.h" #include "register_line.h" #include "safe_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/verifier/method_verifier_test.cc b/runtime/verifier/method_verifier_test.cc index 9dca7f51b5..2bcf3e0c14 100644 --- a/runtime/verifier/method_verifier_test.cc +++ b/runtime/verifier/method_verifier_test.cc @@ -18,7 +18,7 @@ #include <stdio.h> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "class_linker.h" #include "common_runtime_test.h" #include "dex_file.h" diff --git a/runtime/verifier/register_line.h b/runtime/verifier/register_line.h index 8b2dadb119..f9f3e31861 100644 --- a/runtime/verifier/register_line.h +++ b/runtime/verifier/register_line.h @@ -22,7 +22,7 @@ #include "dex_instruction.h" #include "reg_type.h" #include "safe_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { namespace verifier { diff --git a/runtime/zip_archive.cc b/runtime/zip_archive.cc index ddac7d4236..13b4219014 100644 --- a/runtime/zip_archive.cc +++ b/runtime/zip_archive.cc @@ -26,7 +26,7 @@ #include "base/stringprintf.h" #include "base/unix_file/fd_file.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/zip_archive.h b/runtime/zip_archive.h index 3ef0e6b8c2..edaa88b2a3 100644 --- a/runtime/zip_archive.h +++ b/runtime/zip_archive.h @@ -27,7 +27,7 @@ #include "mem_map.h" #include "os.h" #include "safe_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/zip_archive_test.cc b/runtime/zip_archive_test.cc index c43fee55f2..d0624cfa5d 100644 --- a/runtime/zip_archive_test.cc +++ b/runtime/zip_archive_test.cc @@ -21,7 +21,7 @@ #include <sys/types.h> #include <zlib.h> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "common_runtime_test.h" #include "os.h" diff --git a/test/ReferenceMap/stack_walk_refmap_jni.cc b/test/ReferenceMap/stack_walk_refmap_jni.cc index 180db4c230..d8a0eefeaf 100644 --- a/test/ReferenceMap/stack_walk_refmap_jni.cc +++ b/test/ReferenceMap/stack_walk_refmap_jni.cc @@ -16,7 +16,7 @@ #include <stdio.h> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "class_linker.h" #include "dex_file-inl.h" #include "gc_map.h" diff --git a/test/StackWalk/stack_walk_jni.cc b/test/StackWalk/stack_walk_jni.cc index 528586ed7b..d230ddd7b9 100644 --- a/test/StackWalk/stack_walk_jni.cc +++ b/test/StackWalk/stack_walk_jni.cc @@ -16,7 +16,7 @@ #include <stdio.h> -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "class_linker.h" #include "gc_map.h" #include "mirror/art_method.h" |