From 9b6bf426b9179fc5c759a9b2822cf3facda0d4c0 Mon Sep 17 00:00:00 2001 From: Edwin Smith Date: Sun, 14 Jul 2013 10:21:40 -0700 Subject: [PATCH] Move runtime/base/array/* up one level. Also rename array_inline.h to array_data-inl.h --- hphp/compiler/builtin_symbols.cpp | 2 +- hphp/compiler/expression/expression.cpp | 2 +- hphp/compiler/expression/expression_list.cpp | 2 +- hphp/compiler/expression/simple_function_call.cpp | 2 +- .../{array/array_inline.h => array_data-inl.h} | 2 +- hphp/runtime/base/{array => }/array_data.cpp | 8 ++++---- hphp/runtime/base/{array => }/array_data.h | 0 hphp/runtime/base/{array => }/array_init.cpp | 6 +++--- hphp/runtime/base/{array => }/array_init.h | 2 +- hphp/runtime/base/{array => }/array_iterator.cpp | 6 +++--- hphp/runtime/base/{array => }/array_iterator.h | 2 +- hphp/runtime/base/{array => }/array_util.cpp | 4 ++-- hphp/runtime/base/{array => }/array_util.h | 0 hphp/runtime/base/class_info.cpp | 2 +- hphp/runtime/base/complex_types.h | 4 ++-- hphp/runtime/base/execution_context.cpp | 4 ++-- hphp/runtime/base/execution_context.h | 2 +- hphp/runtime/base/file/file.cpp | 4 ++-- hphp/runtime/base/{array => }/hphp_array.cpp | 6 +++--- hphp/runtime/base/{array => }/hphp_array.h | 2 +- hphp/runtime/base/{array => }/hphp_array_sort.cpp | 8 ++++---- hphp/runtime/base/hphp_system.h | 4 ++-- hphp/runtime/base/intercept.cpp | 4 ++-- hphp/runtime/base/{array => }/policy_array.cpp | 14 +++++++------- hphp/runtime/base/{array => }/policy_array.h | 2 +- hphp/runtime/base/preg.cpp | 2 +- hphp/runtime/base/server/server_stats.cpp | 2 +- hphp/runtime/base/shared/immutable_map.cpp | 2 +- hphp/runtime/base/shared/immutable_obj.cpp | 4 ++-- hphp/runtime/base/shared/shared_map.cpp | 4 ++-- hphp/runtime/base/shared/shared_map.h | 2 +- hphp/runtime/base/{array => }/sort_helpers.h | 0 hphp/runtime/base/string_util.cpp | 2 +- hphp/runtime/base/time/datetime.cpp | 2 +- hphp/runtime/base/time/timestamp.cpp | 2 +- hphp/runtime/base/time/timezone.cpp | 2 +- hphp/runtime/base/type_array.cpp | 2 +- hphp/runtime/base/type_array.h | 2 +- hphp/runtime/base/type_object.cpp | 2 +- hphp/runtime/base/type_variant.cpp | 2 +- hphp/runtime/base/type_variant.h | 2 +- hphp/runtime/base/util/extended_logger.cpp | 2 +- hphp/runtime/base/variable_serializer.cpp | 2 +- hphp/runtime/base/variable_unserializer.cpp | 2 +- hphp/runtime/base/zend/zend_collator.cpp | 2 +- hphp/runtime/base/zend/zend_printf.cpp | 2 +- hphp/runtime/debugger/cmd/cmd_machine.cpp | 2 +- hphp/runtime/debugger/cmd/cmd_where.cpp | 2 +- hphp/runtime/ext/ext_array.cpp | 2 +- hphp/runtime/ext/ext_array.h | 2 +- hphp/runtime/ext/ext_collections.cpp | 2 +- hphp/runtime/ext/ext_file.cpp | 2 +- hphp/runtime/ext/ext_session.cpp | 2 +- hphp/runtime/vm/backup_gc.cpp | 2 +- hphp/runtime/vm/bytecode.cpp | 2 +- hphp/runtime/vm/bytecode.h | 2 +- hphp/runtime/vm/class.cpp | 2 +- hphp/runtime/vm/jit/code-gen.cpp | 2 +- hphp/runtime/vm/name_value_table_wrapper.cpp | 4 ++-- hphp/runtime/vm/name_value_table_wrapper.h | 2 +- hphp/runtime/vm/runtime.cpp | 2 +- hphp/runtime/vm/unit.h | 2 +- hphp/tools/bootstrap/gen-ext-hhvm.cpp | 2 +- 63 files changed, 87 insertions(+), 87 deletions(-) rename hphp/runtime/base/{array/array_inline.h => array_data-inl.h} (99%) rename hphp/runtime/base/{array => }/array_data.cpp (98%) rename hphp/runtime/base/{array => }/array_data.h (100%) rename hphp/runtime/base/{array => }/array_init.cpp (92%) rename hphp/runtime/base/{array => }/array_init.h (99%) rename hphp/runtime/base/{array => }/array_iterator.cpp (99%) rename hphp/runtime/base/{array => }/array_iterator.h (99%) rename hphp/runtime/base/{array => }/array_util.cpp (99%) rename hphp/runtime/base/{array => }/array_util.h (100%) rename hphp/runtime/base/{array => }/hphp_array.cpp (99%) rename hphp/runtime/base/{array => }/hphp_array.h (99%) rename hphp/runtime/base/{array => }/hphp_array_sort.cpp (97%) rename hphp/runtime/base/{array => }/policy_array.cpp (98%) rename hphp/runtime/base/{array => }/policy_array.h (99%) rename hphp/runtime/base/{array => }/sort_helpers.h (100%) diff --git a/hphp/compiler/builtin_symbols.cpp b/hphp/compiler/builtin_symbols.cpp index 5908e706a..08f9582d6 100644 --- a/hphp/compiler/builtin_symbols.cpp +++ b/hphp/compiler/builtin_symbols.cpp @@ -30,7 +30,7 @@ #include "hphp/util/parser/hphp.tab.hpp" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/thread_init_fini.h" #include "hphp/util/logger.h" diff --git a/hphp/compiler/expression/expression.cpp b/hphp/compiler/expression/expression.cpp index 39dd7d87e..00baed55d 100644 --- a/hphp/compiler/expression/expression.cpp +++ b/hphp/compiler/expression/expression.cpp @@ -35,7 +35,7 @@ #include "hphp/compiler/expression/function_call.h" #include "hphp/compiler/analysis/file_scope.h" #include "hphp/util/hash.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" using namespace HPHP; diff --git a/hphp/compiler/expression/expression_list.cpp b/hphp/compiler/expression/expression_list.cpp index c04ace57d..e058dcb1c 100644 --- a/hphp/compiler/expression/expression_list.cpp +++ b/hphp/compiler/expression/expression_list.cpp @@ -22,7 +22,7 @@ #include "hphp/compiler/analysis/variable_table.h" #include "hphp/compiler/expression/array_pair_expression.h" #include "hphp/compiler/analysis/function_scope.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_init.h" #include "hphp/compiler/parser/parser.h" using namespace HPHP; diff --git a/hphp/compiler/expression/simple_function_call.cpp b/hphp/compiler/expression/simple_function_call.cpp index f6ff9591e..faedcfb07 100644 --- a/hphp/compiler/expression/simple_function_call.cpp +++ b/hphp/compiler/expression/simple_function_call.cpp @@ -37,7 +37,7 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_init.h" #include "hphp/runtime/base/string_util.h" #include "hphp/runtime/ext/ext_variable.h" diff --git a/hphp/runtime/base/array/array_inline.h b/hphp/runtime/base/array_data-inl.h similarity index 99% rename from hphp/runtime/base/array/array_inline.h rename to hphp/runtime/base/array_data-inl.h index 243bf201d..842bc9c99 100644 --- a/hphp/runtime/base/array/array_inline.h +++ b/hphp/runtime/base/array_data-inl.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_ARRAY_INLINE_H_ #define incl_HPHP_ARRAY_INLINE_H_ -#include "hphp/runtime/base/array/array_data.h" +#include "hphp/runtime/base/array_data.h" #include "hphp/runtime/base/complex_types.h" namespace HPHP { diff --git a/hphp/runtime/base/array/array_data.cpp b/hphp/runtime/base/array_data.cpp similarity index 98% rename from hphp/runtime/base/array/array_data.cpp rename to hphp/runtime/base/array_data.cpp index 2f9508b35..3226cda54 100644 --- a/hphp/runtime/base/array/array_data.cpp +++ b/hphp/runtime/base/array_data.cpp @@ -13,13 +13,13 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/array/array_data.h" +#include "hphp/runtime/base/array_data.h" #include "tbb/concurrent_hash_map.h" #include "hphp/util/exception.h" -#include "hphp/runtime/base/array/array_init.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_init.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/complex_types.h" @@ -27,7 +27,7 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/macros.h" #include "hphp/runtime/base/shared/shared_map.h" -#include "hphp/runtime/base/array/policy_array.h" +#include "hphp/runtime/base/policy_array.h" #include "hphp/runtime/base/comparisons.h" namespace HPHP { diff --git a/hphp/runtime/base/array/array_data.h b/hphp/runtime/base/array_data.h similarity index 100% rename from hphp/runtime/base/array/array_data.h rename to hphp/runtime/base/array_data.h diff --git a/hphp/runtime/base/array/array_init.cpp b/hphp/runtime/base/array_init.cpp similarity index 92% rename from hphp/runtime/base/array/array_init.cpp rename to hphp/runtime/base/array_init.cpp index 5f448bd94..792b20045 100644 --- a/hphp/runtime/base/array/array_init.cpp +++ b/hphp/runtime/base/array_init.cpp @@ -13,9 +13,9 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/array/array_init.h" -#include "hphp/runtime/base/array/policy_array.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/array_init.h" +#include "hphp/runtime/base/policy_array.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/base/runtime_option.h" namespace HPHP { diff --git a/hphp/runtime/base/array/array_init.h b/hphp/runtime/base/array_init.h similarity index 99% rename from hphp/runtime/base/array/array_init.h rename to hphp/runtime/base/array_init.h index 69bc3dd71..ab68b64a9 100644 --- a/hphp/runtime/base/array/array_init.h +++ b/hphp/runtime/base/array_init.h @@ -16,7 +16,7 @@ #ifndef incl_HPHP_ARRAY_INIT_H_ #define incl_HPHP_ARRAY_INIT_H_ -#include "hphp/runtime/base/array/array_data.h" +#include "hphp/runtime/base/array_data.h" #include "hphp/runtime/base/complex_types.h" namespace HPHP { diff --git a/hphp/runtime/base/array/array_iterator.cpp b/hphp/runtime/base/array_iterator.cpp similarity index 99% rename from hphp/runtime/base/array/array_iterator.cpp rename to hphp/runtime/base/array_iterator.cpp index dc4b2e388..754dc40f8 100644 --- a/hphp/runtime/base/array/array_iterator.cpp +++ b/hphp/runtime/base/array_iterator.cpp @@ -14,9 +14,9 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/array/array_iterator.h" -#include "hphp/runtime/base/array/array_data.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/array_iterator.h" +#include "hphp/runtime/base/array_data.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/object_data.h" #include "hphp/runtime/ext/ext_collections.h" diff --git a/hphp/runtime/base/array/array_iterator.h b/hphp/runtime/base/array_iterator.h similarity index 99% rename from hphp/runtime/base/array/array_iterator.h rename to hphp/runtime/base/array_iterator.h index d01e1b98c..f066ea1d0 100644 --- a/hphp/runtime/base/array/array_iterator.h +++ b/hphp/runtime/base/array_iterator.h @@ -20,7 +20,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/util/smart_ptr.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/util/min_max_macros.h" namespace HPHP { diff --git a/hphp/runtime/base/array/array_util.cpp b/hphp/runtime/base/array_util.cpp similarity index 99% rename from hphp/runtime/base/array/array_util.cpp rename to hphp/runtime/base/array_util.cpp index 712832c52..2e1c4d781 100644 --- a/hphp/runtime/base/array/array_util.cpp +++ b/hphp/runtime/base/array_util.cpp @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/array/array_util.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_util.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/string_util.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/runtime_error.h" diff --git a/hphp/runtime/base/array/array_util.h b/hphp/runtime/base/array_util.h similarity index 100% rename from hphp/runtime/base/array/array_util.h rename to hphp/runtime/base/array_util.h diff --git a/hphp/runtime/base/class_info.cpp b/hphp/runtime/base/class_info.cpp index ceb4ee594..7c1ce251e 100644 --- a/hphp/runtime/base/class_info.cpp +++ b/hphp/runtime/base/class_info.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/class_info.h" -#include "hphp/runtime/base/array/array_util.h" +#include "hphp/runtime/base/array_util.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/hphp_system.h" diff --git a/hphp/runtime/base/complex_types.h b/hphp/runtime/base/complex_types.h index 00d9d7a0e..6d507ff02 100644 --- a/hphp/runtime/base/complex_types.h +++ b/hphp/runtime/base/complex_types.h @@ -26,8 +26,8 @@ #include "hphp/runtime/base/ref_data.h" #include "hphp/runtime/base/tv_helpers.h" #include "hphp/runtime/base/type_variant.h" -#include "hphp/runtime/base/array/array_inline.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_data-inl.h" +#include "hphp/runtime/base/array_init.h" #undef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_ diff --git a/hphp/runtime/base/execution_context.cpp b/hphp/runtime/base/execution_context.cpp index 0d0d02409..66c6b214a 100644 --- a/hphp/runtime/base/execution_context.cpp +++ b/hphp/runtime/base/execution_context.cpp @@ -23,8 +23,8 @@ #include "hphp/util/logger.h" #include "hphp/util/process.h" #include "hphp/util/text_color.h" -#include "hphp/runtime/base/array/array_init.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_init.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/memory/memory_manager.h" #include "hphp/runtime/base/memory/sweepable.h" #include "hphp/runtime/base/server/server_stats.h" diff --git a/hphp/runtime/base/execution_context.h b/hphp/runtime/base/execution_context.h index ce4dace95..f537d02b7 100644 --- a/hphp/runtime/base/execution_context.h +++ b/hphp/runtime/base/execution_context.h @@ -24,7 +24,7 @@ #include "hphp/runtime/base/debuggable.h" #include "hphp/runtime/base/server/virtual_host.h" #include "hphp/runtime/base/util/string_buffer.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/vm/funcdict.h" #include "hphp/runtime/vm/func.h" #include "hphp/runtime/vm/bytecode.h" diff --git a/hphp/runtime/base/file/file.cpp b/hphp/runtime/base/file/file.cpp index e0736f0a1..948af66d3 100644 --- a/hphp/runtime/base/file/file.cpp +++ b/hphp/runtime/base/file/file.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/base/server/virtual_host.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/runtime_error.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_init.h" #include "hphp/util/logger.h" #include "hphp/util/process.h" #include "hphp/util/util.h" @@ -31,7 +31,7 @@ #include "hphp/runtime/base/zend/zend_printf.h" #include "hphp/runtime/base/util/exceptions.h" #include -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/file/stream_wrapper_registry.h" namespace HPHP { diff --git a/hphp/runtime/base/array/hphp_array.cpp b/hphp/runtime/base/hphp_array.cpp similarity index 99% rename from hphp/runtime/base/array/hphp_array.cpp rename to hphp/runtime/base/hphp_array.cpp index f8902d961..aa9be8197 100644 --- a/hphp/runtime/base/array/hphp_array.cpp +++ b/hphp/runtime/base/hphp_array.cpp @@ -16,9 +16,9 @@ #define INLINE_VARIANT_HELPER 1 -#include "hphp/runtime/base/array/hphp_array.h" -#include "hphp/runtime/base/array/array_init.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/hphp_array.h" +#include "hphp/runtime/base/array_init.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/runtime_error.h" diff --git a/hphp/runtime/base/array/hphp_array.h b/hphp/runtime/base/hphp_array.h similarity index 99% rename from hphp/runtime/base/array/hphp_array.h rename to hphp/runtime/base/hphp_array.h index 54470b98f..9ee4d0854 100644 --- a/hphp/runtime/base/array/hphp_array.h +++ b/hphp/runtime/base/hphp_array.h @@ -18,7 +18,7 @@ #define incl_HPHP_HPHP_ARRAY_H_ #include "hphp/runtime/base/types.h" -#include "hphp/runtime/base/array/array_data.h" +#include "hphp/runtime/base/array_data.h" #include "hphp/runtime/base/memory/smart_allocator.h" #include "hphp/runtime/base/complex_types.h" diff --git a/hphp/runtime/base/array/hphp_array_sort.cpp b/hphp/runtime/base/hphp_array_sort.cpp similarity index 97% rename from hphp/runtime/base/array/hphp_array_sort.cpp rename to hphp/runtime/base/hphp_array_sort.cpp index e249e2451..f8dee7e46 100644 --- a/hphp/runtime/base/array/hphp_array_sort.cpp +++ b/hphp/runtime/base/hphp_array_sort.cpp @@ -14,10 +14,10 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/array/hphp_array.h" -#include "hphp/runtime/base/array/array_init.h" -#include "hphp/runtime/base/array/array_iterator.h" -#include "hphp/runtime/base/array/sort_helpers.h" +#include "hphp/runtime/base/hphp_array.h" +#include "hphp/runtime/base/array_init.h" +#include "hphp/runtime/base/array_iterator.h" +#include "hphp/runtime/base/sort_helpers.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/vm/jit/translator-inline.h" diff --git a/hphp/runtime/base/hphp_system.h b/hphp/runtime/base/hphp_system.h index cb1d6a4c7..ad06413a8 100644 --- a/hphp/runtime/base/hphp_system.h +++ b/hphp/runtime/base/hphp_system.h @@ -37,8 +37,8 @@ #include "hphp/runtime/base/file/plain_file.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/externals.h" -#include "hphp/runtime/base/array/array_init.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_init.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/util/string_buffer.h" #include "hphp/runtime/base/util/simple_counter.h" #include "hphp/util/shm_counter.h" diff --git a/hphp/runtime/base/intercept.cpp b/hphp/runtime/base/intercept.cpp index 1f5b54231..2743ef8e9 100644 --- a/hphp/runtime/base/intercept.cpp +++ b/hphp/runtime/base/intercept.cpp @@ -15,8 +15,8 @@ */ #include "hphp/runtime/base/intercept.h" #include "hphp/runtime/base/util/request_local.h" -#include "hphp/runtime/base/array/array_init.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_init.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/vm/jit/target-cache.h" diff --git a/hphp/runtime/base/array/policy_array.cpp b/hphp/runtime/base/policy_array.cpp similarity index 98% rename from hphp/runtime/base/array/policy_array.cpp rename to hphp/runtime/base/policy_array.cpp index bda9ade9c..0cfa7b3be 100644 --- a/hphp/runtime/base/array/policy_array.cpp +++ b/hphp/runtime/base/policy_array.cpp @@ -14,11 +14,11 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/array/policy_array.h" -#include "hphp/runtime/base/array/array_init.h" -#include "hphp/runtime/base/array/array_iterator.h" -#include "hphp/runtime/base/array/hphp_array.h" -#include "hphp/runtime/base/array/sort_helpers.h" +#include "hphp/runtime/base/policy_array.h" +#include "hphp/runtime/base/array_init.h" +#include "hphp/runtime/base/array_iterator.h" +#include "hphp/runtime/base/hphp_array.h" +#include "hphp/runtime/base/sort_helpers.h" #include "folly/Foreach.h" TRACE_SET_MOD(runtime); @@ -596,9 +596,9 @@ void PolicyArray::nextInsertWithRef(const Variant& v) { // We need to define k here (before the if/grow) because otherwise // the overzealous gcc issues a spurious warning as such: // - // hphp/runtime/base/array/policy_array.h: In member function 'void + // hphp/runtime/base/policy_array.h: In member function 'void // HPHP::PolicyArray::nextInsertWithRef(const HPHP::Variant&)': - // hphp/runtime/base/array/policy_array.h:114:5: error: assuming + // hphp/runtime/base/policy_array.h:114:5: error: assuming // signed overflow does not occur when assuming that (X + c) < X is // always false [-Werror=strict-overflow] auto const k = nextKeyBump(); diff --git a/hphp/runtime/base/array/policy_array.h b/hphp/runtime/base/policy_array.h similarity index 99% rename from hphp/runtime/base/array/policy_array.h rename to hphp/runtime/base/policy_array.h index 85c315200..7505756d3 100644 --- a/hphp/runtime/base/array/policy_array.h +++ b/hphp/runtime/base/policy_array.h @@ -18,7 +18,7 @@ #define HPHP_POLICY_ARRAY_H_ #include "hphp/runtime/base/types.h" -#include "hphp/runtime/base/array/array_data.h" +#include "hphp/runtime/base/array_data.h" #include "hphp/runtime/base/memory/smart_allocator.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/util/trace.h" diff --git a/hphp/runtime/base/preg.cpp b/hphp/runtime/base/preg.cpp index 29255691a..04c4b1a92 100644 --- a/hphp/runtime/base/preg.cpp +++ b/hphp/runtime/base/preg.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/zend/zend_functions.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/ini_setting.h" #include "hphp/runtime/base/thread_init_fini.h" #include "tbb/concurrent_hash_map.h" diff --git a/hphp/runtime/base/server/server_stats.cpp b/hphp/runtime/base/server/server_stats.cpp index 18e24fc09..e2c237040 100644 --- a/hphp/runtime/base/server/server_stats.cpp +++ b/hphp/runtime/base/server/server_stats.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/preg.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/time/datetime.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_init.h" #include "hphp/util/json.h" #include "hphp/util/compatibility.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/base/shared/immutable_map.cpp b/hphp/runtime/base/shared/immutable_map.cpp index abeeb6266..19b4c42f6 100644 --- a/hphp/runtime/base/shared/immutable_map.cpp +++ b/hphp/runtime/base/shared/immutable_map.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/shared/shared_variant.h" #include "hphp/runtime/base/shared/immutable_map.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" namespace HPHP { diff --git a/hphp/runtime/base/shared/immutable_obj.cpp b/hphp/runtime/base/shared/immutable_obj.cpp index 7b234fb19..f65fe1f18 100644 --- a/hphp/runtime/base/shared/immutable_obj.cpp +++ b/hphp/runtime/base/shared/immutable_obj.cpp @@ -17,8 +17,8 @@ #include "hphp/runtime/base/shared/shared_variant.h" #include "hphp/runtime/base/shared/immutable_obj.h" #include "hphp/runtime/base/externals.h" -#include "hphp/runtime/base/array/array_init.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_init.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/builtin_functions.h" diff --git a/hphp/runtime/base/shared/shared_map.cpp b/hphp/runtime/base/shared/shared_map.cpp index 45fa4d0f3..e160a0b20 100644 --- a/hphp/runtime/base/shared/shared_map.cpp +++ b/hphp/runtime/base/shared/shared_map.cpp @@ -16,8 +16,8 @@ #include "hphp/runtime/base/shared/shared_map.h" #include "hphp/runtime/base/type_conversions.h" -#include "hphp/runtime/base/array/array_iterator.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_iterator.h" +#include "hphp/runtime/base/array_init.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/runtime_error.h" diff --git a/hphp/runtime/base/shared/shared_map.h b/hphp/runtime/base/shared/shared_map.h index e3aa679bc..02bf3ae5e 100644 --- a/hphp/runtime/base/shared/shared_map.h +++ b/hphp/runtime/base/shared/shared_map.h @@ -19,7 +19,7 @@ #include "hphp/util/shared_memory_allocator.h" #include "hphp/runtime/base/shared/shared_variant.h" -#include "hphp/runtime/base/array/array_data.h" +#include "hphp/runtime/base/array_data.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/builtin_functions.h" diff --git a/hphp/runtime/base/array/sort_helpers.h b/hphp/runtime/base/sort_helpers.h similarity index 100% rename from hphp/runtime/base/array/sort_helpers.h rename to hphp/runtime/base/sort_helpers.h diff --git a/hphp/runtime/base/string_util.cpp b/hphp/runtime/base/string_util.cpp index 81b11e93b..6720bce52 100644 --- a/hphp/runtime/base/string_util.cpp +++ b/hphp/runtime/base/string_util.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/base/zend/zend_string.h" #include "hphp/runtime/base/zend/zend_url.h" #include "hphp/runtime/base/runtime_error.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/builtin_functions.h" namespace HPHP { diff --git a/hphp/runtime/base/time/datetime.cpp b/hphp/runtime/base/time/datetime.cpp index 8853275b6..39bc930aa 100644 --- a/hphp/runtime/base/time/datetime.cpp +++ b/hphp/runtime/base/time/datetime.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_init.h" namespace HPHP { diff --git a/hphp/runtime/base/time/timestamp.cpp b/hphp/runtime/base/time/timestamp.cpp index 086a9e522..5bd75872e 100644 --- a/hphp/runtime/base/time/timestamp.cpp +++ b/hphp/runtime/base/time/timestamp.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/time/timestamp.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/time/datetime.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_init.h" #include namespace HPHP { diff --git a/hphp/runtime/base/time/timezone.cpp b/hphp/runtime/base/time/timezone.cpp index 09b83cd1a..ea115085b 100644 --- a/hphp/runtime/base/time/timezone.cpp +++ b/hphp/runtime/base/time/timezone.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/runtime_error.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_init.h" #include "hphp/util/logger.h" namespace HPHP { diff --git a/hphp/runtime/base/type_array.cpp b/hphp/runtime/base/type_array.cpp index df7e78bec..0fdaafd17 100644 --- a/hphp/runtime/base/type_array.cpp +++ b/hphp/runtime/base/type_array.cpp @@ -25,7 +25,7 @@ #include "hphp/runtime/base/zend/zend_string.h" #include "hphp/runtime/base/zend/zend_qsort.h" #include "hphp/runtime/base/zend/zend_printf.h" -#include "hphp/runtime/base/array/array_util.h" +#include "hphp/runtime/base/array_util.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/ext/ext_iconv.h" #include "unicode/coll.h" // icu diff --git a/hphp/runtime/base/type_array.h b/hphp/runtime/base/type_array.h index de4771f35..257ae7012 100644 --- a/hphp/runtime/base/type_array.h +++ b/hphp/runtime/base/type_array.h @@ -26,7 +26,7 @@ #include "hphp/runtime/base/util/smart_ptr.h" #include "hphp/runtime/base/types.h" -#include "hphp/runtime/base/array/array_data.h" +#include "hphp/runtime/base/array_data.h" #include "hphp/runtime/base/type_string.h" #include "hphp/runtime/base/hphp_value.h" diff --git a/hphp/runtime/base/type_object.cpp b/hphp/runtime/base/type_object.cpp index 03ac177a1..39fd7e93a 100644 --- a/hphp/runtime/base/type_object.cpp +++ b/hphp/runtime/base/type_object.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/variable_serializer.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/ext/ext_collections.h" diff --git a/hphp/runtime/base/type_variant.cpp b/hphp/runtime/base/type_variant.cpp index fb2197556..a5e27e3f6 100644 --- a/hphp/runtime/base/type_variant.cpp +++ b/hphp/runtime/base/type_variant.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/ext/ext_variable.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/zend/zend_string.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/util/parser/hphp.tab.hpp" #include "hphp/runtime/vm/runtime.h" #include "hphp/system/systemlib.h" diff --git a/hphp/runtime/base/type_variant.h b/hphp/runtime/base/type_variant.h index 6cbd410bc..eb224d858 100644 --- a/hphp/runtime/base/type_variant.h +++ b/hphp/runtime/base/type_variant.h @@ -31,7 +31,7 @@ #include "hphp/runtime/base/type_object.h" #include "hphp/runtime/base/type_array.h" #include "hphp/runtime/base/memory/smart_allocator.h" -#include "hphp/runtime/base/array/array_data.h" +#include "hphp/runtime/base/array_data.h" #include "hphp/runtime/base/macros.h" namespace HPHP { diff --git a/hphp/runtime/base/util/extended_logger.cpp b/hphp/runtime/base/util/extended_logger.cpp index c37c2bf87..714452b08 100644 --- a/hphp/runtime/base/util/extended_logger.cpp +++ b/hphp/runtime/base/util/extended_logger.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/util/extended_logger.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/variable_serializer.cpp b/hphp/runtime/base/variable_serializer.cpp index 4eb3dfa78..11e135a6c 100644 --- a/hphp/runtime/base/variable_serializer.cpp +++ b/hphp/runtime/base/variable_serializer.cpp @@ -24,7 +24,7 @@ #include #include #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/util/request_local.h" #include "hphp/runtime/ext/ext_json.h" #include "hphp/runtime/ext/ext_collections.h" diff --git a/hphp/runtime/base/variable_unserializer.cpp b/hphp/runtime/base/variable_unserializer.cpp index 2f0d7f972..9f97877bc 100644 --- a/hphp/runtime/base/variable_unserializer.cpp +++ b/hphp/runtime/base/variable_unserializer.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/variable_unserializer.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/zend/zend_strtod.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/ext/ext_class.h" namespace HPHP { diff --git a/hphp/runtime/base/zend/zend_collator.cpp b/hphp/runtime/base/zend/zend_collator.cpp index 3cf15725d..afec4cd65 100644 --- a/hphp/runtime/base/zend/zend_collator.cpp +++ b/hphp/runtime/base/zend/zend_collator.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/runtime_error.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/comparisons.h" namespace HPHP { diff --git a/hphp/runtime/base/zend/zend_printf.cpp b/hphp/runtime/base/zend/zend_printf.cpp index dc1449dd6..403614c47 100644 --- a/hphp/runtime/base/zend/zend_printf.cpp +++ b/hphp/runtime/base/zend/zend_printf.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include #if defined(__APPLE__) diff --git a/hphp/runtime/debugger/cmd/cmd_machine.cpp b/hphp/runtime/debugger/cmd/cmd_machine.cpp index 880625f57..582e4c27e 100644 --- a/hphp/runtime/debugger/cmd/cmd_machine.cpp +++ b/hphp/runtime/debugger/cmd/cmd_machine.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/debugger/cmd/cmd_signal.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/intercept.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_init.h" #include "hphp/runtime/base/util/libevent_http_client.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/debugger/cmd/cmd_where.cpp b/hphp/runtime/debugger/cmd/cmd_where.cpp index a5a51fa63..7bfba016f 100644 --- a/hphp/runtime/debugger/cmd/cmd_where.cpp +++ b/hphp/runtime/debugger/cmd/cmd_where.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/debugger/cmd/cmd_where.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/comparisons.h" namespace HPHP { namespace Eval { diff --git a/hphp/runtime/ext/ext_array.cpp b/hphp/runtime/ext/ext_array.cpp index 5a683c083..cf63b1a66 100644 --- a/hphp/runtime/ext/ext_array.cpp +++ b/hphp/runtime/ext/ext_array.cpp @@ -25,7 +25,7 @@ #include "hphp/runtime/base/sort_flags.h" #include "hphp/runtime/vm/jit/translator.h" #include "hphp/runtime/vm/jit/translator-inline.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/util/logger.h" #define SORT_DESC 3 diff --git a/hphp/runtime/ext/ext_array.h b/hphp/runtime/ext/ext_array.h index ee7f35b54..cb06d3970 100644 --- a/hphp/runtime/ext/ext_array.h +++ b/hphp/runtime/ext/ext_array.h @@ -19,7 +19,7 @@ #define incl_HPHP_EXT_ARRAY_H_ #include "hphp/runtime/base/base_includes.h" -#include "hphp/runtime/base/array/array_util.h" +#include "hphp/runtime/base/array_util.h" #include "hphp/runtime/base/zend/zend_collator.h" namespace HPHP { diff --git a/hphp/runtime/ext/ext_collections.cpp b/hphp/runtime/ext/ext_collections.cpp index 2544e751e..107d0678c 100644 --- a/hphp/runtime/ext/ext_collections.cpp +++ b/hphp/runtime/ext/ext_collections.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_collections.h" #include "hphp/runtime/base/variable_serializer.h" -#include "hphp/runtime/base/array/sort_helpers.h" +#include "hphp/runtime/base/sort_helpers.h" #include "hphp/runtime/ext/ext_array.h" #include "hphp/runtime/ext/ext_math.h" #include "hphp/runtime/ext/ext_intl.h" diff --git a/hphp/runtime/ext/ext_file.cpp b/hphp/runtime/ext/ext_file.cpp index f75952a40..eb3ceccd1 100644 --- a/hphp/runtime/ext/ext_file.cpp +++ b/hphp/runtime/ext/ext_file.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/ini_setting.h" -#include "hphp/runtime/base/array/array_util.h" +#include "hphp/runtime/base/array_util.h" #include "hphp/runtime/base/util/http_client.h" #include "hphp/runtime/base/util/request_local.h" #include "hphp/runtime/base/server/static_content_cache.h" diff --git a/hphp/runtime/ext/ext_session.cpp b/hphp/runtime/ext/ext_session.cpp index d8850b7fb..39e06ed6d 100644 --- a/hphp/runtime/ext/ext_session.cpp +++ b/hphp/runtime/ext/ext_session.cpp @@ -26,7 +26,7 @@ #include "hphp/runtime/base/ini_setting.h" #include "hphp/runtime/base/time/datetime.h" #include "hphp/runtime/base/variable_unserializer.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/util/lock.h" #include "hphp/util/logger.h" #include "hphp/util/compatibility.h" diff --git a/hphp/runtime/vm/backup_gc.cpp b/hphp/runtime/vm/backup_gc.cpp index 778679c38..67198e827 100644 --- a/hphp/runtime/vm/backup_gc.cpp +++ b/hphp/runtime/vm/backup_gc.cpp @@ -29,7 +29,7 @@ #include "hphp/runtime/base/memory/smart_allocator.h" #include "hphp/runtime/base/memory/memory_manager.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/vm/class.h" namespace HPHP { diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp index c08f644ec..4678be6d4 100644 --- a/hphp/runtime/vm/bytecode.cpp +++ b/hphp/runtime/vm/bytecode.cpp @@ -36,7 +36,7 @@ #include "hphp/runtime/base/base_includes.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/base/strings.h" #include "hphp/util/util.h" #include "hphp/util/trace.h" diff --git a/hphp/runtime/vm/bytecode.h b/hphp/runtime/vm/bytecode.h index d3d475c14..42c6e2753 100644 --- a/hphp/runtime/vm/bytecode.h +++ b/hphp/runtime/vm/bytecode.h @@ -25,7 +25,7 @@ #include "hphp/runtime/base/tv_arith.h" #include "hphp/runtime/base/tv_conversions.h" #include "hphp/runtime/base/class_info.h" -#include "hphp/runtime/base/array/array_iterator.h" +#include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/vm/class.h" #include "hphp/runtime/vm/unit.h" #include "hphp/runtime/vm/func.h" diff --git a/hphp/runtime/vm/class.cpp b/hphp/runtime/vm/class.cpp index d3d37aa78..84b5f2d4f 100644 --- a/hphp/runtime/vm/class.cpp +++ b/hphp/runtime/vm/class.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/comparisons.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/util/util.h" #include "hphp/util/debug.h" #include "hphp/runtime/vm/jit/target-cache.h" diff --git a/hphp/runtime/vm/jit/code-gen.cpp b/hphp/runtime/vm/jit/code-gen.cpp index e6bcd4a04..8bb54cf37 100644 --- a/hphp/runtime/vm/jit/code-gen.cpp +++ b/hphp/runtime/vm/jit/code-gen.cpp @@ -24,7 +24,7 @@ #include "hphp/util/trace.h" #include "hphp/util/util.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/runtime_option.h" diff --git a/hphp/runtime/vm/name_value_table_wrapper.cpp b/hphp/runtime/vm/name_value_table_wrapper.cpp index d7e6adff2..2b091cac5 100644 --- a/hphp/runtime/vm/name_value_table_wrapper.cpp +++ b/hphp/runtime/vm/name_value_table_wrapper.cpp @@ -16,8 +16,8 @@ #include "hphp/runtime/vm/name_value_table_wrapper.h" #include "hphp/runtime/base/runtime_error.h" -#include "hphp/runtime/base/array/array_iterator.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_iterator.h" +#include "hphp/runtime/base/array_init.h" namespace HPHP { diff --git a/hphp/runtime/vm/name_value_table_wrapper.h b/hphp/runtime/vm/name_value_table_wrapper.h index 5ae978f06..e999e13d2 100644 --- a/hphp/runtime/vm/name_value_table_wrapper.h +++ b/hphp/runtime/vm/name_value_table_wrapper.h @@ -17,7 +17,7 @@ #define incl_HPHP_RUNTIME_VM_NAME_VALUE_TABLE_WRAPPER_H #include "hphp/runtime/vm/name_value_table.h" -#include "hphp/runtime/base/array/array_data.h" +#include "hphp/runtime/base/array_data.h" namespace HPHP { diff --git a/hphp/runtime/vm/runtime.cpp b/hphp/runtime/vm/runtime.cpp index 8e041b825..5b8c94018 100644 --- a/hphp/runtime/vm/runtime.cpp +++ b/hphp/runtime/vm/runtime.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/zend/zend_string.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/ext/ext_closure.h" #include "hphp/runtime/ext/ext_continuation.h" diff --git a/hphp/runtime/vm/unit.h b/hphp/runtime/vm/unit.h index ecba45442..232825e68 100644 --- a/hphp/runtime/vm/unit.h +++ b/hphp/runtime/vm/unit.h @@ -23,7 +23,7 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/vm/repo_helpers.h" #include "hphp/runtime/vm/named_entity.h" -#include "hphp/runtime/base/array/hphp_array.h" +#include "hphp/runtime/base/hphp_array.h" #include "hphp/util/range.h" #include "hphp/util/parser/location.h" #include "hphp/runtime/base/md5.h" diff --git a/hphp/tools/bootstrap/gen-ext-hhvm.cpp b/hphp/tools/bootstrap/gen-ext-hhvm.cpp index ca81bbf26..389368c07 100644 --- a/hphp/tools/bootstrap/gen-ext-hhvm.cpp +++ b/hphp/tools/bootstrap/gen-ext-hhvm.cpp @@ -45,7 +45,7 @@ bool g_armMode = false; constexpr char* g_allIncludes = R"( #include "hphp/runtime/ext_hhvm/ext_hhvm.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/array/array_init.h" +#include "hphp/runtime/base/array_init.h" #include "hphp/runtime/ext/ext.h" #include "hphp/runtime/vm/class.h" #include "hphp/runtime/vm/runtime.h"