From 355a49c38fb541fc79cbf0cc03a4e6ad6f38128b Mon Sep 17 00:00:00 2001 From: Edwin Smith Date: Fri, 2 Aug 2013 14:18:19 -0700 Subject: [PATCH] Rename files in runtim/base, part 5 Differential Revision: D913077 --- hphp/compiler/builtin_symbols.cpp | 2 +- hphp/compiler/compiler.cpp | 4 ++-- hphp/compiler/expression/scalar_expression.cpp | 2 +- hphp/compiler/expression/simple_function_call.cpp | 2 +- hphp/hhvm/process_init.h | 2 +- hphp/runtime/base/array_data.cpp | 2 +- hphp/runtime/base/array_iterator.h | 2 +- hphp/runtime/base/array_util.cpp | 2 +- hphp/runtime/base/concurrent_shared_store.h | 6 +++--- hphp/runtime/base/datetime.cpp | 2 +- hphp/runtime/base/datetime.h | 2 +- hphp/runtime/base/debuggable.h | 2 +- hphp/runtime/base/execution_context.h | 2 +- hphp/runtime/base/file-repository.cpp | 2 +- hphp/runtime/base/file-repository.h | 2 +- hphp/runtime/base/file.cpp | 2 +- hphp/runtime/base/hardware_counter.cpp | 2 +- hphp/runtime/base/hphp_array.cpp | 2 +- hphp/runtime/base/hphp_array.h | 2 +- hphp/runtime/base/hphp_array_sort.cpp | 2 +- hphp/runtime/base/hphp_system.h | 8 ++++---- hphp/runtime/base/http-stream-wrapper.cpp | 2 +- hphp/runtime/base/http_client.h | 2 +- hphp/runtime/base/immutable_map.cpp | 2 +- hphp/runtime/base/immutable_obj.cpp | 2 +- hphp/runtime/base/memory_manager.cpp | 2 +- hphp/runtime/base/object_data.h | 2 +- hphp/runtime/base/policy_array.cpp | 2 +- hphp/runtime/base/policy_array.h | 2 +- hphp/runtime/base/preg.cpp | 4 ++-- hphp/runtime/base/program_functions.cpp | 6 +++--- hphp/runtime/base/runtime_option.cpp | 4 ++-- hphp/runtime/base/{shared_map.cpp => shared-map.cpp} | 2 +- hphp/runtime/base/{shared_map.h => shared-map.h} | 2 +- .../base/{shared_store_base.cpp => shared-store-base.cpp} | 2 +- .../base/{shared_store_base.h => shared-store-base.h} | 2 +- .../{shared_store_stats.cpp => shared-store-stats.cpp} | 2 +- .../base/{shared_store_stats.h => shared-store-stats.h} | 2 +- .../runtime/base/{shared_string.cpp => shared-string.cpp} | 2 +- hphp/runtime/base/{shared_string.h => shared-string.h} | 2 +- .../base/{shared_variant.cpp => shared-variant.cpp} | 4 ++-- hphp/runtime/base/{shared_variant.h => shared-variant.h} | 0 .../base/{simple_counter.cpp => simple-counter.cpp} | 2 +- hphp/runtime/base/{simple_counter.h => simple-counter.h} | 0 .../base/{smart_allocator.cpp => smart-allocator.cpp} | 2 +- .../runtime/base/{smart_allocator.h => smart-allocator.h} | 0 .../base/{smart_containers.h => smart-containers.h} | 0 hphp/runtime/base/{smart_object.h => smart-object.h} | 2 +- hphp/runtime/base/{smart_ptr.h => smart-ptr.h} | 0 hphp/runtime/base/{sort_flags.h => sort-flags.h} | 0 hphp/runtime/base/{sort_helpers.h => sort-helpers.h} | 2 +- hphp/runtime/base/{ssl_socket.cpp => ssl-socket.cpp} | 2 +- hphp/runtime/base/{ssl_socket.h => ssl-socket.h} | 0 hphp/runtime/base/{stat_cache.cpp => stat-cache.cpp} | 2 +- hphp/runtime/base/{stat_cache.h => stat-cache.h} | 2 +- hphp/runtime/base/stream-wrapper-registry.cpp | 2 +- .../runtime/base/{string_buffer.cpp => string-buffer.cpp} | 2 +- hphp/runtime/base/{string_buffer.h => string-buffer.h} | 0 hphp/runtime/base/{string_data.cpp => string-data.cpp} | 4 ++-- hphp/runtime/base/{string_data.h => string-data.h} | 2 +- hphp/runtime/base/{string_util.cpp => string-util.cpp} | 2 +- hphp/runtime/base/{string_util.h => string-util.h} | 0 hphp/runtime/base/{thread_info.cpp => thread-info.cpp} | 2 +- .../base/{thread_init_fini.cpp => thread-init-fini.cpp} | 4 ++-- .../base/{thread_init_fini.h => thread-init-fini.h} | 0 .../runtime/base/{thrift_buffer.cpp => thrift-buffer.cpp} | 2 +- hphp/runtime/base/{thrift_buffer.h => thrift-buffer.h} | 0 hphp/runtime/base/type-array.cpp | 2 +- hphp/runtime/base/type-array.h | 2 +- hphp/runtime/base/type-object.h | 2 +- hphp/runtime/base/type-string.h | 4 ++-- hphp/runtime/base/type-variant.h | 2 +- hphp/runtime/base/url-file.h | 2 +- hphp/runtime/base/variable-serializer.h | 4 ++-- hphp/runtime/base/variable-unserializer.h | 2 +- hphp/runtime/base/zend-ini.lex.yy.cpp | 2 +- hphp/runtime/base/zend-string.cpp | 2 +- hphp/runtime/base/zend-string.h | 2 +- hphp/runtime/debugger/break_point.cpp | 2 +- hphp/runtime/debugger/cmd/cmd_print.cpp | 2 +- hphp/runtime/debugger/cmd/cmd_thread.cpp | 2 +- hphp/runtime/debugger/debugger_base.h | 2 +- hphp/runtime/debugger/debugger_client.cpp | 2 +- hphp/runtime/debugger/debugger_thrift_buffer.h | 2 +- hphp/runtime/ext/JSON_parser.cpp | 2 +- hphp/runtime/ext/JSON_parser.h | 2 +- hphp/runtime/ext/asio/asio_context.h | 2 +- hphp/runtime/ext/asio/blockable_wait_handle.cpp | 2 +- hphp/runtime/ext/ext_apc.h | 2 +- hphp/runtime/ext/ext_array.cpp | 2 +- hphp/runtime/ext/ext_collections.cpp | 2 +- hphp/runtime/ext/ext_curl.cpp | 2 +- hphp/runtime/ext/ext_error.cpp | 2 +- hphp/runtime/ext/ext_fb.cpp | 6 +++--- hphp/runtime/ext/ext_iconv.cpp | 2 +- hphp/runtime/ext/ext_mb.cpp | 2 +- hphp/runtime/ext/ext_mysql.h | 2 +- hphp/runtime/ext/ext_openssl.cpp | 2 +- hphp/runtime/ext/ext_pdo.cpp | 2 +- hphp/runtime/ext/ext_process.cpp | 4 ++-- hphp/runtime/ext/ext_reflection.cpp | 2 +- hphp/runtime/ext/ext_server.cpp | 2 +- hphp/runtime/ext/ext_session.cpp | 2 +- hphp/runtime/ext/ext_soap.cpp | 2 +- hphp/runtime/ext/ext_socket.cpp | 2 +- hphp/runtime/ext/ext_stream.cpp | 2 +- hphp/runtime/ext/ext_string.cpp | 2 +- hphp/runtime/ext/ext_url.cpp | 4 ++-- hphp/runtime/ext/mailparse/mime.h | 2 +- hphp/runtime/ext/mailparse/rfc822.cpp | 2 +- hphp/runtime/ext/soap/encoding.cpp | 2 +- hphp/runtime/server/admin_request_handler.cpp | 4 ++-- hphp/runtime/server/dynamic_content_cache.h | 2 +- hphp/runtime/server/http_request_handler.h | 2 +- hphp/runtime/server/http_server.cpp | 2 +- hphp/runtime/server/libevent_server_with_takeover.cpp | 2 +- hphp/runtime/server/pagelet_server.cpp | 2 +- hphp/runtime/server/replay_transport.cpp | 2 +- hphp/runtime/server/request_uri.cpp | 2 +- hphp/runtime/server/server_stats.h | 2 +- hphp/runtime/server/static_content_cache.h | 2 +- hphp/runtime/server/transport.cpp | 2 +- hphp/runtime/server/upload.cpp | 2 +- hphp/runtime/server/virtual_host.cpp | 2 +- hphp/runtime/vm/backup-gc.cpp | 2 +- hphp/runtime/vm/bytecode.cpp | 2 +- hphp/runtime/vm/fixed-string-map.h | 2 +- hphp/runtime/vm/indexed-string-map.h | 2 +- hphp/runtime/vm/jit/block.h | 2 +- hphp/runtime/vm/jit/cfg.h | 2 +- hphp/runtime/vm/jit/code-gen.cpp | 2 +- hphp/runtime/vm/jit/ir.cpp | 2 +- hphp/runtime/vm/jit/layout.h | 2 +- hphp/runtime/vm/jit/linear-scan.cpp | 2 +- hphp/runtime/vm/jit/normalized-instruction.h | 2 +- hphp/runtime/vm/jit/print.cpp | 2 +- hphp/runtime/vm/jit/region-method.cpp | 2 +- hphp/runtime/vm/jit/region-onebc.cpp | 2 +- hphp/runtime/vm/jit/region-selection.h | 2 +- hphp/runtime/vm/jit/simplifier.cpp | 2 +- hphp/runtime/vm/jit/simplifier.h | 2 +- hphp/runtime/vm/jit/state-vector.h | 2 +- hphp/runtime/vm/jit/translator-x64.h | 2 +- hphp/runtime/vm/jit/translator.h | 2 +- hphp/runtime/vm/object-allocator-sizes.cpp | 2 +- hphp/test/ext/test.cpp | 2 +- hphp/test/ext/test_cpp_base.cpp | 2 +- hphp/test/ext/test_util.cpp | 2 +- 148 files changed, 157 insertions(+), 157 deletions(-) rename hphp/runtime/base/{shared_map.cpp => shared-map.cpp} (99%) rename hphp/runtime/base/{shared_map.h => shared-map.h} (99%) rename hphp/runtime/base/{shared_store_base.cpp => shared-store-base.cpp} (99%) rename hphp/runtime/base/{shared_store_base.h => shared-store-base.h} (99%) rename hphp/runtime/base/{shared_store_stats.cpp => shared-store-stats.cpp} (99%) rename hphp/runtime/base/{shared_store_stats.h => shared-store-stats.h} (99%) rename hphp/runtime/base/{shared_string.cpp => shared-string.cpp} (98%) rename hphp/runtime/base/{shared_string.h => shared-string.h} (98%) rename hphp/runtime/base/{shared_variant.cpp => shared-variant.cpp} (99%) rename hphp/runtime/base/{shared_variant.h => shared-variant.h} (100%) rename hphp/runtime/base/{simple_counter.cpp => simple-counter.cpp} (98%) rename hphp/runtime/base/{simple_counter.h => simple-counter.h} (100%) rename hphp/runtime/base/{smart_allocator.cpp => smart-allocator.cpp} (98%) rename hphp/runtime/base/{smart_allocator.h => smart-allocator.h} (100%) rename hphp/runtime/base/{smart_containers.h => smart-containers.h} (100%) rename hphp/runtime/base/{smart_object.h => smart-object.h} (99%) rename hphp/runtime/base/{smart_ptr.h => smart-ptr.h} (100%) rename hphp/runtime/base/{sort_flags.h => sort-flags.h} (100%) rename hphp/runtime/base/{sort_helpers.h => sort-helpers.h} (99%) rename hphp/runtime/base/{ssl_socket.cpp => ssl-socket.cpp} (99%) rename hphp/runtime/base/{ssl_socket.h => ssl-socket.h} (100%) rename hphp/runtime/base/{stat_cache.cpp => stat-cache.cpp} (99%) rename hphp/runtime/base/{stat_cache.h => stat-cache.h} (99%) rename hphp/runtime/base/{string_buffer.cpp => string-buffer.cpp} (99%) rename hphp/runtime/base/{string_buffer.h => string-buffer.h} (100%) rename hphp/runtime/base/{string_data.cpp => string-data.cpp} (99%) rename hphp/runtime/base/{string_data.h => string-data.h} (99%) rename hphp/runtime/base/{string_util.cpp => string-util.cpp} (99%) rename hphp/runtime/base/{string_util.h => string-util.h} (100%) rename hphp/runtime/base/{thread_info.cpp => thread-info.cpp} (99%) rename hphp/runtime/base/{thread_init_fini.cpp => thread-init-fini.cpp} (97%) rename hphp/runtime/base/{thread_init_fini.h => thread-init-fini.h} (100%) rename hphp/runtime/base/{thrift_buffer.cpp => thrift-buffer.cpp} (99%) rename hphp/runtime/base/{thrift_buffer.h => thrift-buffer.h} (100%) diff --git a/hphp/compiler/builtin_symbols.cpp b/hphp/compiler/builtin_symbols.cpp index 0bfdf2e27..026f0c590 100644 --- a/hphp/compiler/builtin_symbols.cpp +++ b/hphp/compiler/builtin_symbols.cpp @@ -32,7 +32,7 @@ #include "hphp/runtime/base/program_functions.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/runtime/base/thread-init-fini.h" #include "hphp/util/logger.h" #include "hphp/util/util.h" #include diff --git a/hphp/compiler/compiler.cpp b/hphp/compiler/compiler.cpp index 1d1d5e8c0..6c127359c 100644 --- a/hphp/compiler/compiler.cpp +++ b/hphp/compiler/compiler.cpp @@ -36,9 +36,9 @@ #include "hphp/util/async_func.h" #include "hphp/util/current_executable.h" #include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/base/externals.h" -#include "hphp/runtime/base/thread_init_fini.h" +#include "hphp/runtime/base/thread-init-fini.h" #include "hphp/runtime/vm/repo.h" #include "hphp/system/systemlib.h" #include "hphp/util/repo_schema.h" diff --git a/hphp/compiler/expression/scalar_expression.cpp b/hphp/compiler/expression/scalar_expression.cpp index 70c6f6f12..5549c24fb 100644 --- a/hphp/compiler/expression/scalar_expression.cpp +++ b/hphp/compiler/expression/scalar_expression.cpp @@ -26,7 +26,7 @@ #include "hphp/compiler/analysis/class_scope.h" #include "hphp/compiler/parser/parser.h" #include "hphp/util/hash.h" -#include "hphp/runtime/base/string_data.h" +#include "hphp/runtime/base/string-data.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/ext/ext_variable.h" diff --git a/hphp/compiler/expression/simple_function_call.cpp b/hphp/compiler/expression/simple_function_call.cpp index e02e42468..79b3a394d 100644 --- a/hphp/compiler/expression/simple_function_call.cpp +++ b/hphp/compiler/expression/simple_function_call.cpp @@ -38,7 +38,7 @@ #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/array_init.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/zend-functions.h" #include "hphp/runtime/ext/ext_variable.h" diff --git a/hphp/hhvm/process_init.h b/hphp/hhvm/process_init.h index 745e1230a..847e02e6b 100644 --- a/hphp/hhvm/process_init.h +++ b/hphp/hhvm/process_init.h @@ -17,7 +17,7 @@ #define incl_HPHP_HHVM_PROCESS_INIT_H_ #include "hphp/util/base.h" -#include "hphp/runtime/base/thread_init_fini.h" +#include "hphp/runtime/base/thread-init-fini.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/compiler/analysis/emitter.h" diff --git a/hphp/runtime/base/array_data.cpp b/hphp/runtime/base/array_data.cpp index b8c8cc04e..abbd25669 100644 --- a/hphp/runtime/base/array_data.cpp +++ b/hphp/runtime/base/array_data.cpp @@ -26,7 +26,7 @@ #include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/macros.h" -#include "hphp/runtime/base/shared_map.h" +#include "hphp/runtime/base/shared-map.h" #include "hphp/runtime/base/policy_array.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/vm/name-value-table-wrapper.h" diff --git a/hphp/runtime/base/array_iterator.h b/hphp/runtime/base/array_iterator.h index 0b34c5afa..6d71a355b 100644 --- a/hphp/runtime/base/array_iterator.h +++ b/hphp/runtime/base/array_iterator.h @@ -18,7 +18,7 @@ #define incl_HPHP_ARRAY_ITERATOR_H_ #include "hphp/runtime/base/types.h" -#include "hphp/runtime/base/smart_ptr.h" +#include "hphp/runtime/base/smart-ptr.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/hphp_array.h" #include "hphp/util/min_max_macros.h" diff --git a/hphp/runtime/base/array_util.cpp b/hphp/runtime/base/array_util.cpp index 46beb7fb2..a74ac52ec 100644 --- a/hphp/runtime/base/array_util.cpp +++ b/hphp/runtime/base/array_util.cpp @@ -16,7 +16,7 @@ #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/string-util.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/ext/ext_math.h" diff --git a/hphp/runtime/base/concurrent_shared_store.h b/hphp/runtime/base/concurrent_shared_store.h index adf09dd17..598206039 100644 --- a/hphp/runtime/base/concurrent_shared_store.h +++ b/hphp/runtime/base/concurrent_shared_store.h @@ -19,16 +19,16 @@ #define TBB_PREVIEW_CONCURRENT_PRIORITY_QUEUE 1 -#include "hphp/runtime/base/shared_store_base.h" +#include "hphp/runtime/base/shared-store-base.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/shared_variant.h" +#include "hphp/runtime/base/shared-variant.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/server/server_stats.h" #include "tbb/concurrent_hash_map.h" #include "tbb/concurrent_priority_queue.h" -#include "hphp/runtime/base/shared_store_stats.h" +#include "hphp/runtime/base/shared-store-stats.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/datetime.cpp b/hphp/runtime/base/datetime.cpp index 53ce57f13..0566a9b64 100644 --- a/hphp/runtime/base/datetime.cpp +++ b/hphp/runtime/base/datetime.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/datetime.h" #include "hphp/runtime/base/dateinterval.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" diff --git a/hphp/runtime/base/datetime.h b/hphp/runtime/base/datetime.h index 56f3d6f5b..7341a6a38 100644 --- a/hphp/runtime/base/datetime.h +++ b/hphp/runtime/base/datetime.h @@ -18,7 +18,7 @@ #define incl_HPHP_DATETIME_H_ #include "hphp/runtime/base/types.h" -#include "hphp/runtime/base/smart_object.h" +#include "hphp/runtime/base/smart-object.h" #include "hphp/runtime/base/timezone.h" #include "hphp/runtime/base/dateinterval.h" #include "hphp/runtime/base/request_local.h" diff --git a/hphp/runtime/base/debuggable.h b/hphp/runtime/base/debuggable.h index 09db6d47b..ede6a6255 100644 --- a/hphp/runtime/base/debuggable.h +++ b/hphp/runtime/base/debuggable.h @@ -17,7 +17,7 @@ #define incl_HPHP_DEBUGGABLE_H_ #include "hphp/util/base.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/complex_types.h" namespace HPHP { diff --git a/hphp/runtime/base/execution_context.h b/hphp/runtime/base/execution_context.h index b660eef40..872f1afe8 100644 --- a/hphp/runtime/base/execution_context.h +++ b/hphp/runtime/base/execution_context.h @@ -22,7 +22,7 @@ #include "hphp/runtime/server/transport.h" #include "hphp/runtime/base/debuggable.h" #include "hphp/runtime/server/virtual_host.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/hphp_array.h" #include "hphp/runtime/vm/funcdict.h" #include "hphp/runtime/vm/func.h" diff --git a/hphp/runtime/base/file-repository.cpp b/hphp/runtime/base/file-repository.cpp index 5775b45e7..f35c7c506 100644 --- a/hphp/runtime/base/file-repository.cpp +++ b/hphp/runtime/base/file-repository.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/base/zend-string.h" #include "hphp/util/process.h" #include "hphp/util/trace.h" -#include "hphp/runtime/base/stat_cache.h" +#include "hphp/runtime/base/stat-cache.h" #include "hphp/runtime/base/stream-wrapper-registry.h" #include "hphp/runtime/base/file-stream-wrapper.h" #include "hphp/runtime/server/source_root_info.h" diff --git a/hphp/runtime/base/file-repository.h b/hphp/runtime/base/file-repository.h index 41fb068c5..dfc581956 100644 --- a/hphp/runtime/base/file-repository.h +++ b/hphp/runtime/base/file-repository.h @@ -24,7 +24,7 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/md5.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #ifdef __APPLE__ #define st_mtim st_mtimespec diff --git a/hphp/runtime/base/file.cpp b/hphp/runtime/base/file.cpp index 680022d9f..9cd03aeae 100644 --- a/hphp/runtime/base/file.cpp +++ b/hphp/runtime/base/file.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/file.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/server/static_content_cache.h" diff --git a/hphp/runtime/base/hardware_counter.cpp b/hphp/runtime/base/hardware_counter.cpp index d7cb7712c..d66de011f 100644 --- a/hphp/runtime/base/hardware_counter.cpp +++ b/hphp/runtime/base/hardware_counter.cpp @@ -33,7 +33,7 @@ #include "asm/unistd.h" #include #include "linux/perf_event.h" -#include "hphp/runtime/base/string_data.h" +#include "hphp/runtime/base/string-data.h" #include "hphp/runtime/base/zend-url.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/vm/jit/translator-x64.h" diff --git a/hphp/runtime/base/hphp_array.cpp b/hphp/runtime/base/hphp_array.cpp index d42ad164a..5cf525d81 100644 --- a/hphp/runtime/base/hphp_array.cpp +++ b/hphp/runtime/base/hphp_array.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/variable-serializer.h" -#include "hphp/runtime/base/shared_map.h" +#include "hphp/runtime/base/shared-map.h" #include "hphp/util/hash.h" #include "hphp/util/lock.h" #include "hphp/util/alloc.h" diff --git a/hphp/runtime/base/hphp_array.h b/hphp/runtime/base/hphp_array.h index 645306c62..5a921396b 100644 --- a/hphp/runtime/base/hphp_array.h +++ b/hphp/runtime/base/hphp_array.h @@ -19,7 +19,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/array_data.h" -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/base/complex_types.h" namespace HPHP { diff --git a/hphp/runtime/base/hphp_array_sort.cpp b/hphp/runtime/base/hphp_array_sort.cpp index 870723e63..a18e49277 100644 --- a/hphp/runtime/base/hphp_array_sort.cpp +++ b/hphp/runtime/base/hphp_array_sort.cpp @@ -17,7 +17,7 @@ #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/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 68569fb4a..3d9f9bd90 100644 --- a/hphp/runtime/base/hphp_system.h +++ b/hphp/runtime/base/hphp_system.h @@ -29,18 +29,18 @@ #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/comparisons.h" -#include "hphp/runtime/base/smart_object.h" +#include "hphp/runtime/base/smart-object.h" #include "hphp/runtime/base/list_assignment.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/util/util.h" #include "hphp/runtime/base/plain-file.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/array_init.h" #include "hphp/runtime/base/array_iterator.h" -#include "hphp/runtime/base/string_buffer.h" -#include "hphp/runtime/base/simple_counter.h" +#include "hphp/runtime/base/string-buffer.h" +#include "hphp/runtime/base/simple-counter.h" #include "hphp/util/shm_counter.h" namespace HPHP { diff --git a/hphp/runtime/base/http-stream-wrapper.cpp b/hphp/runtime/base/http-stream-wrapper.cpp index a48223896..30b4e114d 100644 --- a/hphp/runtime/base/http-stream-wrapper.cpp +++ b/hphp/runtime/base/http-stream-wrapper.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/http-stream-wrapper.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/url-file.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/ext/ext_stream.h" diff --git a/hphp/runtime/base/http_client.h b/hphp/runtime/base/http_client.h index 0f8ad49e8..7118dd7bc 100644 --- a/hphp/runtime/base/http_client.h +++ b/hphp/runtime/base/http_client.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_HTTP_CLIENT_H_ #define incl_HPHP_HTTP_CLIENT_H_ -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/server/transport.h" namespace HPHP { diff --git a/hphp/runtime/base/immutable_map.cpp b/hphp/runtime/base/immutable_map.cpp index e567cd002..adc9e1a8e 100644 --- a/hphp/runtime/base/immutable_map.cpp +++ b/hphp/runtime/base/immutable_map.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/immutable_map.h" -#include "hphp/runtime/base/shared_variant.h" +#include "hphp/runtime/base/shared-variant.h" #include "hphp/runtime/base/array_iterator.h" namespace HPHP { diff --git a/hphp/runtime/base/immutable_obj.cpp b/hphp/runtime/base/immutable_obj.cpp index c21a89110..701d7f532 100644 --- a/hphp/runtime/base/immutable_obj.cpp +++ b/hphp/runtime/base/immutable_obj.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/immutable_obj.h" -#include "hphp/runtime/base/shared_variant.h" +#include "hphp/runtime/base/shared-variant.h" #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/array_init.h" #include "hphp/runtime/base/array_iterator.h" diff --git a/hphp/runtime/base/memory_manager.cpp b/hphp/runtime/base/memory_manager.cpp index e5feaf914..6fb18e817 100644 --- a/hphp/runtime/base/memory_manager.cpp +++ b/hphp/runtime/base/memory_manager.cpp @@ -23,7 +23,7 @@ #endif #define __STDC_LIMIT_MACROS -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/base/sweepable.h" #include "hphp/runtime/base/memory_profile.h" #include "hphp/runtime/base/builtin_functions.h" diff --git a/hphp/runtime/base/object_data.h b/hphp/runtime/base/object_data.h index 21b06f8c7..0774494e3 100644 --- a/hphp/runtime/base/object_data.h +++ b/hphp/runtime/base/object_data.h @@ -18,7 +18,7 @@ #define incl_HPHP_OBJECT_DATA_H_ #include "hphp/runtime/base/countable.h" -#include "hphp/runtime/base/smart_ptr.h" +#include "hphp/runtime/base/smart-ptr.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/macros.h" #include "hphp/runtime/vm/class.h" diff --git a/hphp/runtime/base/policy_array.cpp b/hphp/runtime/base/policy_array.cpp index aee962c53..7629524da 100644 --- a/hphp/runtime/base/policy_array.cpp +++ b/hphp/runtime/base/policy_array.cpp @@ -18,7 +18,7 @@ #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 "hphp/runtime/base/sort-helpers.h" #include "folly/Foreach.h" TRACE_SET_MOD(runtime); diff --git a/hphp/runtime/base/policy_array.h b/hphp/runtime/base/policy_array.h index 4344411de..c06624f69 100644 --- a/hphp/runtime/base/policy_array.h +++ b/hphp/runtime/base/policy_array.h @@ -19,7 +19,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/array_data.h" -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/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 8579340d0..579079b1d 100644 --- a/hphp/runtime/base/preg.cpp +++ b/hphp/runtime/base/preg.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/request_local.h" #include "hphp/util/lock.h" #include "hphp/util/logger.h" @@ -24,7 +24,7 @@ #include "hphp/runtime/base/zend-functions.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/ini_setting.h" -#include "hphp/runtime/base/thread_init_fini.h" +#include "hphp/runtime/base/thread-init-fini.h" #include "tbb/concurrent_hash_map.h" #define PREG_PATTERN_ORDER 1 diff --git a/hphp/runtime/base/program_functions.cpp b/hphp/runtime/base/program_functions.cpp index d9b88e32f..1fc45828e 100644 --- a/hphp/runtime/base/program_functions.cpp +++ b/hphp/runtime/base/program_functions.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/thread_init_fini.h" +#include "hphp/runtime/base/thread-init-fini.h" #include "hphp/runtime/base/code_coverage.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/pprof_server.h" @@ -41,7 +41,7 @@ #include "hphp/util/light_process.h" #include "hphp/util/repo_schema.h" #include "hphp/util/current_executable.h" -#include "hphp/runtime/base/stat_cache.h" +#include "hphp/runtime/base/stat-cache.h" #include "hphp/runtime/ext/extension.h" #include "hphp/runtime/ext/ext_fb.h" #include "hphp/runtime/ext/ext_json.h" @@ -50,7 +50,7 @@ #include "hphp/runtime/ext/ext_function.h" #include "hphp/runtime/debugger/debugger.h" #include "hphp/runtime/debugger/debugger_client.h" -#include "hphp/runtime/base/simple_counter.h" +#include "hphp/runtime/base/simple-counter.h" #include "hphp/runtime/base/extended_logger.h" #include "hphp/runtime/base/stream-wrapper-registry.h" diff --git a/hphp/runtime/base/runtime_option.cpp b/hphp/runtime/base/runtime_option.cpp index 754878df1..2c167534c 100644 --- a/hphp/runtime/base/runtime_option.cpp +++ b/hphp/runtime/base/runtime_option.cpp @@ -26,10 +26,10 @@ #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/shared_store_base.h" +#include "hphp/runtime/base/shared-store-base.h" #include "hphp/runtime/server/access_log.h" #include "hphp/runtime/base/extended_logger.h" -#include "hphp/runtime/base/simple_counter.h" +#include "hphp/runtime/base/simple-counter.h" #include "hphp/util/util.h" #include "hphp/util/network.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/shared_map.cpp b/hphp/runtime/base/shared-map.cpp similarity index 99% rename from hphp/runtime/base/shared_map.cpp rename to hphp/runtime/base/shared-map.cpp index 944e94793..a3a7d0e24 100644 --- a/hphp/runtime/base/shared_map.cpp +++ b/hphp/runtime/base/shared-map.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/shared_map.h" +#include "hphp/runtime/base/shared-map.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/array_iterator.h" #include "hphp/runtime/base/array_init.h" diff --git a/hphp/runtime/base/shared_map.h b/hphp/runtime/base/shared-map.h similarity index 99% rename from hphp/runtime/base/shared_map.h rename to hphp/runtime/base/shared-map.h index 8d21719c8..d1958c51b 100644 --- a/hphp/runtime/base/shared_map.h +++ b/hphp/runtime/base/shared-map.h @@ -18,7 +18,7 @@ #define incl_HPHP_SHARED_MAP_H_ #include "hphp/util/shared_memory_allocator.h" -#include "hphp/runtime/base/shared_variant.h" +#include "hphp/runtime/base/shared-variant.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/shared_store_base.cpp b/hphp/runtime/base/shared-store-base.cpp similarity index 99% rename from hphp/runtime/base/shared_store_base.cpp rename to hphp/runtime/base/shared-store-base.cpp index bc9e268e8..a95304925 100644 --- a/hphp/runtime/base/shared_store_base.cpp +++ b/hphp/runtime/base/shared-store-base.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/shared_store_base.h" +#include "hphp/runtime/base/shared-store-base.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/type-conversions.h" diff --git a/hphp/runtime/base/shared_store_base.h b/hphp/runtime/base/shared-store-base.h similarity index 99% rename from hphp/runtime/base/shared_store_base.h rename to hphp/runtime/base/shared-store-base.h index a032031f4..4438be1e7 100644 --- a/hphp/runtime/base/shared_store_base.h +++ b/hphp/runtime/base/shared-store-base.h @@ -18,7 +18,7 @@ #define incl_HPHP_SHARED_STORE_BASE_H_ #include "hphp/runtime/base/types.h" -#include "hphp/runtime/base/shared_variant.h" +#include "hphp/runtime/base/shared-variant.h" #include "hphp/util/lock.h" #include "hphp/util/smalllocks.h" #include "hphp/runtime/base/complex_types.h" diff --git a/hphp/runtime/base/shared_store_stats.cpp b/hphp/runtime/base/shared-store-stats.cpp similarity index 99% rename from hphp/runtime/base/shared_store_stats.cpp rename to hphp/runtime/base/shared-store-stats.cpp index e67dd2ef0..f7abab36f 100644 --- a/hphp/runtime/base/shared_store_stats.cpp +++ b/hphp/runtime/base/shared-store-stats.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/shared_store_stats.h" +#include "hphp/runtime/base/shared-store-stats.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/util/json.h" diff --git a/hphp/runtime/base/shared_store_stats.h b/hphp/runtime/base/shared-store-stats.h similarity index 99% rename from hphp/runtime/base/shared_store_stats.h rename to hphp/runtime/base/shared-store-stats.h index cb42d9f5f..41df9c5e5 100644 --- a/hphp/runtime/base/shared_store_stats.h +++ b/hphp/runtime/base/shared-store-stats.h @@ -19,7 +19,7 @@ #include "tbb/concurrent_hash_map.h" -#include "hphp/runtime/base/shared_variant.h" +#include "hphp/runtime/base/shared-variant.h" #include "hphp/runtime/base/complex_types.h" namespace HPHP { diff --git a/hphp/runtime/base/shared_string.cpp b/hphp/runtime/base/shared-string.cpp similarity index 98% rename from hphp/runtime/base/shared_string.cpp rename to hphp/runtime/base/shared-string.cpp index fce3df2c5..6e6b1d1d7 100644 --- a/hphp/runtime/base/shared_string.cpp +++ b/hphp/runtime/base/shared-string.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/shared_string.h" +#include "hphp/runtime/base/shared-string.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/shared_string.h b/hphp/runtime/base/shared-string.h similarity index 98% rename from hphp/runtime/base/shared_string.h rename to hphp/runtime/base/shared-string.h index 7b4912008..d01b04d3b 100644 --- a/hphp/runtime/base/shared_string.h +++ b/hphp/runtime/base/shared-string.h @@ -18,7 +18,7 @@ #define incl_HPHP_CPP_BASE_SHARED_SHARED_STRING_H_ #include "hphp/util/base.h" -#include "hphp/runtime/base/smart_ptr.h" +#include "hphp/runtime/base/smart-ptr.h" #include "tbb/concurrent_hash_map.h" #include "tbb/atomic.h" #include "hphp/util/atomic.h" diff --git a/hphp/runtime/base/shared_variant.cpp b/hphp/runtime/base/shared-variant.cpp similarity index 99% rename from hphp/runtime/base/shared_variant.cpp rename to hphp/runtime/base/shared-variant.cpp index b6d253e6a..5abf33ed2 100644 --- a/hphp/runtime/base/shared_variant.cpp +++ b/hphp/runtime/base/shared-variant.cpp @@ -14,10 +14,10 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/shared_variant.h" +#include "hphp/runtime/base/shared-variant.h" #include "hphp/runtime/ext/ext_variable.h" #include "hphp/runtime/ext/ext_apc.h" -#include "hphp/runtime/base/shared_map.h" +#include "hphp/runtime/base/shared-map.h" #include "hphp/runtime/base/runtime_option.h" namespace HPHP { diff --git a/hphp/runtime/base/shared_variant.h b/hphp/runtime/base/shared-variant.h similarity index 100% rename from hphp/runtime/base/shared_variant.h rename to hphp/runtime/base/shared-variant.h diff --git a/hphp/runtime/base/simple_counter.cpp b/hphp/runtime/base/simple-counter.cpp similarity index 98% rename from hphp/runtime/base/simple_counter.cpp rename to hphp/runtime/base/simple-counter.cpp index 55255785e..1a4246e68 100644 --- a/hphp/runtime/base/simple_counter.cpp +++ b/hphp/runtime/base/simple-counter.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/simple_counter.h" +#include "hphp/runtime/base/simple-counter.h" #include "hphp/runtime/ext/ext_math.h" #include "hphp/util/stack_trace.h" #include "hphp/util/lock.h" diff --git a/hphp/runtime/base/simple_counter.h b/hphp/runtime/base/simple-counter.h similarity index 100% rename from hphp/runtime/base/simple_counter.h rename to hphp/runtime/base/simple-counter.h diff --git a/hphp/runtime/base/smart_allocator.cpp b/hphp/runtime/base/smart-allocator.cpp similarity index 98% rename from hphp/runtime/base/smart_allocator.cpp rename to hphp/runtime/base/smart-allocator.cpp index 4aa889a2d..5e06fb976 100644 --- a/hphp/runtime/base/smart_allocator.cpp +++ b/hphp/runtime/base/smart-allocator.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/base/memory_manager.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/server/server_stats.h" diff --git a/hphp/runtime/base/smart_allocator.h b/hphp/runtime/base/smart-allocator.h similarity index 100% rename from hphp/runtime/base/smart_allocator.h rename to hphp/runtime/base/smart-allocator.h diff --git a/hphp/runtime/base/smart_containers.h b/hphp/runtime/base/smart-containers.h similarity index 100% rename from hphp/runtime/base/smart_containers.h rename to hphp/runtime/base/smart-containers.h diff --git a/hphp/runtime/base/smart_object.h b/hphp/runtime/base/smart-object.h similarity index 99% rename from hphp/runtime/base/smart_object.h rename to hphp/runtime/base/smart-object.h index dffb82f8c..2d00a2ed2 100644 --- a/hphp/runtime/base/smart_object.h +++ b/hphp/runtime/base/smart-object.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_SMART_OBJECT_H_ #define incl_HPHP_SMART_OBJECT_H_ -#include "hphp/runtime/base/smart_ptr.h" +#include "hphp/runtime/base/smart-ptr.h" #include "hphp/runtime/base/complex_types.h" namespace HPHP { diff --git a/hphp/runtime/base/smart_ptr.h b/hphp/runtime/base/smart-ptr.h similarity index 100% rename from hphp/runtime/base/smart_ptr.h rename to hphp/runtime/base/smart-ptr.h diff --git a/hphp/runtime/base/sort_flags.h b/hphp/runtime/base/sort-flags.h similarity index 100% rename from hphp/runtime/base/sort_flags.h rename to hphp/runtime/base/sort-flags.h diff --git a/hphp/runtime/base/sort_helpers.h b/hphp/runtime/base/sort-helpers.h similarity index 99% rename from hphp/runtime/base/sort_helpers.h rename to hphp/runtime/base/sort-helpers.h index aab38a2bc..9bd0248d3 100644 --- a/hphp/runtime/base/sort_helpers.h +++ b/hphp/runtime/base/sort-helpers.h @@ -21,7 +21,7 @@ #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/zend-functions.h" -#include "hphp/runtime/base/sort_flags.h" +#include "hphp/runtime/base/sort-flags.h" #include "hphp/util/safesort.h" namespace HPHP { diff --git a/hphp/runtime/base/ssl_socket.cpp b/hphp/runtime/base/ssl-socket.cpp similarity index 99% rename from hphp/runtime/base/ssl_socket.cpp rename to hphp/runtime/base/ssl-socket.cpp index 03fcb41a0..b7c13b92b 100644 --- a/hphp/runtime/base/ssl_socket.cpp +++ b/hphp/runtime/base/ssl-socket.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/ssl_socket.h" +#include "hphp/runtime/base/ssl-socket.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/util/util.h" diff --git a/hphp/runtime/base/ssl_socket.h b/hphp/runtime/base/ssl-socket.h similarity index 100% rename from hphp/runtime/base/ssl_socket.h rename to hphp/runtime/base/ssl-socket.h diff --git a/hphp/runtime/base/stat_cache.cpp b/hphp/runtime/base/stat-cache.cpp similarity index 99% rename from hphp/runtime/base/stat_cache.cpp rename to hphp/runtime/base/stat-cache.cpp index 992c8fb13..dcf621bfd 100644 --- a/hphp/runtime/base/stat_cache.cpp +++ b/hphp/runtime/base/stat-cache.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/stat_cache.h" +#include "hphp/runtime/base/stat-cache.h" #include #include diff --git a/hphp/runtime/base/stat_cache.h b/hphp/runtime/base/stat-cache.h similarity index 99% rename from hphp/runtime/base/stat_cache.h rename to hphp/runtime/base/stat-cache.h index d5a29bc56..4e29e4ca5 100644 --- a/hphp/runtime/base/stat_cache.h +++ b/hphp/runtime/base/stat-cache.h @@ -25,7 +25,7 @@ #include "hphp/util/base.h" #include "hphp/util/lock.h" -#include "hphp/runtime/base/smart_ptr.h" +#include "hphp/runtime/base/smart-ptr.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/stream-wrapper-registry.cpp b/hphp/runtime/base/stream-wrapper-registry.cpp index d7c5351a8..37ec04597 100644 --- a/hphp/runtime/base/stream-wrapper-registry.cpp +++ b/hphp/runtime/base/stream-wrapper-registry.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/stream-wrapper-registry.h" #include "hphp/runtime/base/file.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/file-stream-wrapper.h" #include "hphp/runtime/base/php-stream-wrapper.h" #include "hphp/runtime/base/http-stream-wrapper.h" diff --git a/hphp/runtime/base/string_buffer.cpp b/hphp/runtime/base/string-buffer.cpp similarity index 99% rename from hphp/runtime/base/string_buffer.cpp rename to hphp/runtime/base/string-buffer.cpp index e7708aeb2..fbed2245e 100644 --- a/hphp/runtime/base/string_buffer.cpp +++ b/hphp/runtime/base/string-buffer.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/file.h" #include "hphp/runtime/base/zend-functions.h" #include "hphp/runtime/base/utf8-decode.h" diff --git a/hphp/runtime/base/string_buffer.h b/hphp/runtime/base/string-buffer.h similarity index 100% rename from hphp/runtime/base/string_buffer.h rename to hphp/runtime/base/string-buffer.h diff --git a/hphp/runtime/base/string_data.cpp b/hphp/runtime/base/string-data.cpp similarity index 99% rename from hphp/runtime/base/string_data.cpp rename to hphp/runtime/base/string-data.cpp index 63349a4b8..82bcd9c96 100644 --- a/hphp/runtime/base/string_data.cpp +++ b/hphp/runtime/base/string-data.cpp @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/string_data.h" -#include "hphp/runtime/base/shared_variant.h" +#include "hphp/runtime/base/string-data.h" +#include "hphp/runtime/base/shared-variant.h" #include "hphp/runtime/base/zend-functions.h" #include "hphp/runtime/base/exceptions.h" #include "hphp/util/alloc.h" diff --git a/hphp/runtime/base/string_data.h b/hphp/runtime/base/string-data.h similarity index 99% rename from hphp/runtime/base/string_data.h rename to hphp/runtime/base/string-data.h index eae344d51..861feb1d3 100644 --- a/hphp/runtime/base/string_data.h +++ b/hphp/runtime/base/string-data.h @@ -19,7 +19,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/countable.h" -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/base/macros.h" #include "hphp/runtime/base/bstring.h" #include "hphp/util/hash.h" diff --git a/hphp/runtime/base/string_util.cpp b/hphp/runtime/base/string-util.cpp similarity index 99% rename from hphp/runtime/base/string_util.cpp rename to hphp/runtime/base/string-util.cpp index eb3d2e222..c2c21892f 100644 --- a/hphp/runtime/base/string_util.cpp +++ b/hphp/runtime/base/string-util.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/util/zend/zend_html.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/runtime/base/zend-url.h" diff --git a/hphp/runtime/base/string_util.h b/hphp/runtime/base/string-util.h similarity index 100% rename from hphp/runtime/base/string_util.h rename to hphp/runtime/base/string-util.h diff --git a/hphp/runtime/base/thread_info.cpp b/hphp/runtime/base/thread-info.cpp similarity index 99% rename from hphp/runtime/base/thread_info.cpp rename to hphp/runtime/base/thread-info.cpp index 0e0b95e11..d325b7d7b 100644 --- a/hphp/runtime/base/thread_info.cpp +++ b/hphp/runtime/base/thread-info.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/hphp_system.h" #include "hphp/runtime/base/code_coverage.h" -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/vm/jit/target-cache.h" #include "hphp/util/lock.h" #include "hphp/util/alloc.h" diff --git a/hphp/runtime/base/thread_init_fini.cpp b/hphp/runtime/base/thread-init-fini.cpp similarity index 97% rename from hphp/runtime/base/thread_init_fini.cpp rename to hphp/runtime/base/thread-init-fini.cpp index b3515645e..e57487b3d 100644 --- a/hphp/runtime/base/thread_init_fini.cpp +++ b/hphp/runtime/base/thread-init-fini.cpp @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/thread_init_fini.h" -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/thread-init-fini.h" +#include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/preg.h" #include "hphp/runtime/server/server_stats.h" diff --git a/hphp/runtime/base/thread_init_fini.h b/hphp/runtime/base/thread-init-fini.h similarity index 100% rename from hphp/runtime/base/thread_init_fini.h rename to hphp/runtime/base/thread-init-fini.h diff --git a/hphp/runtime/base/thrift_buffer.cpp b/hphp/runtime/base/thrift-buffer.cpp similarity index 99% rename from hphp/runtime/base/thrift_buffer.cpp rename to hphp/runtime/base/thrift-buffer.cpp index 06f122443..de38aaa94 100644 --- a/hphp/runtime/base/thrift_buffer.cpp +++ b/hphp/runtime/base/thrift-buffer.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/thrift_buffer.h" +#include "hphp/runtime/base/thrift-buffer.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/variable-unserializer.h" diff --git a/hphp/runtime/base/thrift_buffer.h b/hphp/runtime/base/thrift-buffer.h similarity index 100% rename from hphp/runtime/base/thrift_buffer.h rename to hphp/runtime/base/thrift-buffer.h diff --git a/hphp/runtime/base/type-array.cpp b/hphp/runtime/base/type-array.cpp index 5680c6215..a55d3d15d 100644 --- a/hphp/runtime/base/type-array.cpp +++ b/hphp/runtime/base/type-array.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/comparisons.h" #include "hphp/util/exception.h" -#include "hphp/runtime/base/shared_map.h" +#include "hphp/runtime/base/shared-map.h" #include "hphp/runtime/base/variable-serializer.h" #include "hphp/runtime/base/variable-unserializer.h" #include "hphp/runtime/base/comparisons.h" diff --git a/hphp/runtime/base/type-array.h b/hphp/runtime/base/type-array.h index c693b82ff..c20dfd419 100644 --- a/hphp/runtime/base/type-array.h +++ b/hphp/runtime/base/type-array.h @@ -24,7 +24,7 @@ #include -#include "hphp/runtime/base/smart_ptr.h" +#include "hphp/runtime/base/smart-ptr.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/array_data.h" #include "hphp/runtime/base/type-string.h" diff --git a/hphp/runtime/base/type-object.h b/hphp/runtime/base/type-object.h index c4eb1f412..95e3991de 100644 --- a/hphp/runtime/base/type-object.h +++ b/hphp/runtime/base/type-object.h @@ -22,7 +22,7 @@ Include 'complex_types.h' instead. #endif -#include "hphp/runtime/base/smart_ptr.h" +#include "hphp/runtime/base/smart-ptr.h" #include "hphp/runtime/base/object_data.h" #include "hphp/runtime/base/type-string.h" #include "hphp/runtime/base/hphp_value.h" diff --git a/hphp/runtime/base/type-string.h b/hphp/runtime/base/type-string.h index 8938facdc..672f1d84a 100644 --- a/hphp/runtime/base/type-string.h +++ b/hphp/runtime/base/type-string.h @@ -23,8 +23,8 @@ #endif #include "hphp/util/assertions.h" -#include "hphp/runtime/base/smart_ptr.h" -#include "hphp/runtime/base/string_data.h" +#include "hphp/runtime/base/smart-ptr.h" +#include "hphp/runtime/base/string-data.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/hphp_value.h" diff --git a/hphp/runtime/base/type-variant.h b/hphp/runtime/base/type-variant.h index eaf8c7ce2..9c633a348 100644 --- a/hphp/runtime/base/type-variant.h +++ b/hphp/runtime/base/type-variant.h @@ -30,7 +30,7 @@ #include "hphp/runtime/base/type-string.h" #include "hphp/runtime/base/type-object.h" #include "hphp/runtime/base/type-array.h" -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/base/array_data.h" #include "hphp/runtime/base/macros.h" diff --git a/hphp/runtime/base/url-file.h b/hphp/runtime/base/url-file.h index e845f4d67..df731bc40 100644 --- a/hphp/runtime/base/url-file.h +++ b/hphp/runtime/base/url-file.h @@ -18,7 +18,7 @@ #define incl_HPHP_URL_FILE_H_ #include "hphp/runtime/base/mem-file.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/variable-serializer.h b/hphp/runtime/base/variable-serializer.h index c0c5d2913..8b242b616 100644 --- a/hphp/runtime/base/variable-serializer.h +++ b/hphp/runtime/base/variable-serializer.h @@ -18,8 +18,8 @@ #define incl_HPHP_VARIABLE_SERIALIZER_H_ #include "hphp/runtime/base/types.h" -#include "hphp/runtime/base/string_buffer.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/string-buffer.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/class.h" #include "hphp/runtime/vm/unit.h" diff --git a/hphp/runtime/base/variable-unserializer.h b/hphp/runtime/base/variable-unserializer.h index 626b00408..286553c43 100644 --- a/hphp/runtime/base/variable-unserializer.h +++ b/hphp/runtime/base/variable-unserializer.h @@ -18,7 +18,7 @@ #define incl_HPHP_VARIABLE_UNSERIALIZER_H_ #include "hphp/runtime/base/types.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/zend-ini.lex.yy.cpp b/hphp/runtime/base/zend-ini.lex.yy.cpp index f32359f76..5e3b7487d 100644 --- a/hphp/runtime/base/zend-ini.lex.yy.cpp +++ b/hphp/runtime/base/zend-ini.lex.yy.cpp @@ -683,7 +683,7 @@ char *yytext; #include #include "hphp/runtime/base/zend-ini.tab.hpp" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/ini_setting.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/zend-string.cpp b/hphp/runtime/base/zend-string.cpp index 228508090..7314eaaad 100644 --- a/hphp/runtime/base/zend-string.cpp +++ b/hphp/runtime/base/zend-string.cpp @@ -26,7 +26,7 @@ #include "hphp/runtime/base/bstring.h" #include "hphp/runtime/base/exceptions.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/base/builtin_functions.h" diff --git a/hphp/runtime/base/zend-string.h b/hphp/runtime/base/zend-string.h index b73af8132..f2d2a0c9c 100644 --- a/hphp/runtime/base/zend-string.h +++ b/hphp/runtime/base/zend-string.h @@ -21,7 +21,7 @@ #include "hphp/util/base.h" #include "hphp/util/zend/zend_string.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/debugger/break_point.cpp b/hphp/runtime/debugger/break_point.cpp index 8b126ce62..9e3220171 100644 --- a/hphp/runtime/debugger/break_point.cpp +++ b/hphp/runtime/debugger/break_point.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/preg.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/class_info.h" -#include "hphp/runtime/base/stat_cache.h" +#include "hphp/runtime/base/stat-cache.h" #include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/base/comparisons.h" diff --git a/hphp/runtime/debugger/cmd/cmd_print.cpp b/hphp/runtime/debugger/cmd/cmd_print.cpp index 74ac565b3..c1cdde780 100644 --- a/hphp/runtime/debugger/cmd/cmd_print.cpp +++ b/hphp/runtime/debugger/cmd/cmd_print.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/debugger/cmd/cmd_print.h" #include "hphp/runtime/base/datetime.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/vm/debugger-hook.h" #include "hphp/runtime/base/array_init.h" diff --git a/hphp/runtime/debugger/cmd/cmd_thread.cpp b/hphp/runtime/debugger/cmd/cmd_thread.cpp index b76ef485e..4cf9ba604 100644 --- a/hphp/runtime/debugger/cmd/cmd_thread.cpp +++ b/hphp/runtime/debugger/cmd/cmd_thread.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/debugger/cmd/cmd_thread.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/util/process.h" namespace HPHP { namespace Eval { diff --git a/hphp/runtime/debugger/debugger_base.h b/hphp/runtime/debugger/debugger_base.h index 3031a1968..e8ac34302 100644 --- a/hphp/runtime/debugger/debugger_base.h +++ b/hphp/runtime/debugger/debugger_base.h @@ -18,7 +18,7 @@ #define incl_HPHP_EVAL_DEBUGGER_BASE_H_ #include "hphp/runtime/debugger/break_point.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/exceptions.h" #include "hphp/util/hdf.h" diff --git a/hphp/runtime/debugger/debugger_client.cpp b/hphp/runtime/debugger/debugger_client.cpp index 8c8a62f79..73b024665 100644 --- a/hphp/runtime/debugger/debugger_client.cpp +++ b/hphp/runtime/debugger/debugger_client.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/debugger/cmd/all.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/variable-serializer.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/preg.h" #include "hphp/runtime/ext/ext_json.h" #include "hphp/runtime/ext/ext_socket.h" diff --git a/hphp/runtime/debugger/debugger_thrift_buffer.h b/hphp/runtime/debugger/debugger_thrift_buffer.h index 0f1fff6b4..277da8ff2 100644 --- a/hphp/runtime/debugger/debugger_thrift_buffer.h +++ b/hphp/runtime/debugger/debugger_thrift_buffer.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_DEBUGGER_THRIFT_BUFFER_H_ #define incl_HPHP_DEBUGGER_THRIFT_BUFFER_H_ -#include "hphp/runtime/base/thrift_buffer.h" +#include "hphp/runtime/base/thrift-buffer.h" #include "hphp/runtime/base/socket.h" #include "hphp/runtime/base/variable-serializer.h" diff --git a/hphp/runtime/ext/JSON_parser.cpp b/hphp/runtime/ext/JSON_parser.cpp index c52371fef..20a6bea7c 100644 --- a/hphp/runtime/ext/JSON_parser.cpp +++ b/hphp/runtime/ext/JSON_parser.cpp @@ -33,7 +33,7 @@ SOFTWARE. #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/utf8-decode.h" #include "hphp/system/systemlib.h" -#include "hphp/runtime/base/thread_init_fini.h" +#include "hphp/runtime/base/thread-init-fini.h" #define MAX_LENGTH_OF_LONG 20 static const char long_min_digits[] = "9223372036854775808"; diff --git a/hphp/runtime/ext/JSON_parser.h b/hphp/runtime/ext/JSON_parser.h index 73d954bf5..b6e448077 100644 --- a/hphp/runtime/ext/JSON_parser.h +++ b/hphp/runtime/ext/JSON_parser.h @@ -19,7 +19,7 @@ #define incl_HPHP_JSON_PARSER_H_ #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" namespace HPHP { diff --git a/hphp/runtime/ext/asio/asio_context.h b/hphp/runtime/ext/asio/asio_context.h index bab6680a6..718d5248d 100644 --- a/hphp/runtime/ext/asio/asio_context.h +++ b/hphp/runtime/ext/asio/asio_context.h @@ -21,7 +21,7 @@ #include #include #include "hphp/runtime/base/base_includes.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/blockable_wait_handle.cpp b/hphp/runtime/ext/asio/blockable_wait_handle.cpp index 9ea988a5b..48c910c2d 100644 --- a/hphp/runtime/ext/asio/blockable_wait_handle.cpp +++ b/hphp/runtime/ext/asio/blockable_wait_handle.cpp @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/ext/ext_asio.h" #include "hphp/runtime/ext/asio/asio_context.h" #include "hphp/system/systemlib.h" diff --git a/hphp/runtime/ext/ext_apc.h b/hphp/runtime/ext/ext_apc.h index 83c34c774..683d5bc90 100644 --- a/hphp/runtime/ext/ext_apc.h +++ b/hphp/runtime/ext/ext_apc.h @@ -19,7 +19,7 @@ #define incl_HPHP_EXT_APC_H_ #include "hphp/runtime/base/base_includes.h" -#include "hphp/runtime/base/shared_store_base.h" +#include "hphp/runtime/base/shared-store-base.h" #include "hphp/runtime/server/upload.h" namespace HPHP { diff --git a/hphp/runtime/ext/ext_array.cpp b/hphp/runtime/ext/ext_array.cpp index cfcb4b211..50f365bc4 100644 --- a/hphp/runtime/ext/ext_array.cpp +++ b/hphp/runtime/ext/ext_array.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/request_local.h" #include "hphp/runtime/base/zend-collator.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/base/sort_flags.h" +#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/hphp_array.h" diff --git a/hphp/runtime/ext/ext_collections.cpp b/hphp/runtime/ext/ext_collections.cpp index 21e5ca343..caa7c43bc 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/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_curl.cpp b/hphp/runtime/ext/ext_curl.cpp index 5ab49cd86..0f5cb13d1 100644 --- a/hphp/runtime/ext/ext_curl.cpp +++ b/hphp/runtime/ext/ext_curl.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_curl.h" #include "hphp/runtime/ext/ext_function.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/libevent_http_client.h" #include "hphp/runtime/base/curl_tls_workarounds.h" #include "hphp/runtime/base/runtime_option.h" diff --git a/hphp/runtime/ext/ext_error.cpp b/hphp/runtime/ext/ext_error.cpp index bd687c42b..f22cfd595 100644 --- a/hphp/runtime/ext/ext_error.cpp +++ b/hphp/runtime/ext/ext_error.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_error.h" #include "hphp/runtime/base/exceptions.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/ext/ext_file.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/ext/ext_fb.cpp b/hphp/runtime/ext/ext_fb.cpp index f9ee60a65..012207465 100644 --- a/hphp/runtime/ext/ext_fb.cpp +++ b/hphp/runtime/ext/ext_fb.cpp @@ -20,11 +20,11 @@ #include "hphp/runtime/ext/ext_mysql.h" #include "hphp/util/db_conn.h" #include "hphp/util/logger.h" -#include "hphp/runtime/base/stat_cache.h" +#include "hphp/runtime/base/stat-cache.h" #include "netinet/in.h" #include "hphp/runtime/base/externals.h" -#include "hphp/runtime/base/string_util.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-util.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/code_coverage.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/intercept.h" diff --git a/hphp/runtime/ext/ext_iconv.cpp b/hphp/runtime/ext/ext_iconv.cpp index 963a74c5a..0d601aeec 100644 --- a/hphp/runtime/ext/ext_iconv.cpp +++ b/hphp/runtime/ext/ext_iconv.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/ext/ext_iconv.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/request_local.h" #include "hphp/runtime/base/zend-functions.h" #include "hphp/runtime/base/zend-string.h" diff --git a/hphp/runtime/ext/ext_mb.cpp b/hphp/runtime/ext/ext_mb.cpp index ce394f4b2..be2ea042d 100644 --- a/hphp/runtime/ext/ext_mb.cpp +++ b/hphp/runtime/ext/ext_mb.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/ext/ext_mb.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/request_local.h" #include "hphp/runtime/ext/php_unicode.h" #include "hphp/runtime/ext/unicode_data.h" diff --git a/hphp/runtime/ext/ext_mysql.h b/hphp/runtime/ext/ext_mysql.h index 5349c8296..d9aac057b 100644 --- a/hphp/runtime/ext/ext_mysql.h +++ b/hphp/runtime/ext/ext_mysql.h @@ -22,7 +22,7 @@ #include "hphp/runtime/base/base_includes.h" #include "mysql.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #ifdef PHP_MYSQL_UNIX_SOCK_ADDR #ifdef MYSQL_UNIX_ADDR diff --git a/hphp/runtime/ext/ext_openssl.cpp b/hphp/runtime/ext/ext_openssl.cpp index cb20547e1..48f5805c5 100644 --- a/hphp/runtime/ext/ext_openssl.cpp +++ b/hphp/runtime/ext/ext_openssl.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/ext/ext_openssl.h" -#include "hphp/runtime/base/ssl_socket.h" +#include "hphp/runtime/base/ssl-socket.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/ext/ext_pdo.cpp b/hphp/runtime/ext/ext_pdo.cpp index 0def3fab8..6bb2895fd 100644 --- a/hphp/runtime/ext/ext_pdo.cpp +++ b/hphp/runtime/ext/ext_pdo.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/ext/ext_stream.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/ini_setting.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/request_local.h" #include "hphp/runtime/base/macros.h" diff --git a/hphp/runtime/ext/ext_process.cpp b/hphp/runtime/ext/ext_process.cpp index 7d2e62a0c..66cad0919 100644 --- a/hphp/runtime/ext/ext_process.cpp +++ b/hphp/runtime/ext/ext_process.cpp @@ -18,9 +18,9 @@ #include "hphp/runtime/ext/ext_process.h" #include "hphp/runtime/ext/ext_file.h" #include "hphp/runtime/ext/ext_function.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/zend-string.h" -#include "hphp/runtime/base/thread_init_fini.h" +#include "hphp/runtime/base/thread-init-fini.h" #include #include #include diff --git a/hphp/runtime/ext/ext_reflection.cpp b/hphp/runtime/ext/ext_reflection.cpp index 70c18774f..54e2fbcec 100644 --- a/hphp/runtime/ext/ext_reflection.cpp +++ b/hphp/runtime/ext/ext_reflection.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/util/parser/parser.h" diff --git a/hphp/runtime/ext/ext_server.cpp b/hphp/runtime/ext/ext_server.cpp index 12b2d8282..cd67b1ccf 100644 --- a/hphp/runtime/ext/ext_server.cpp +++ b/hphp/runtime/ext/ext_server.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/server/xbox_server.h" #include "hphp/runtime/server/http_protocol.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/server/rpc_request_handler.h" #define DANGLING_HEADER "HPHP_DANGLING" diff --git a/hphp/runtime/ext/ext_session.cpp b/hphp/runtime/ext/ext_session.cpp index 4c5856ea3..33658fc1c 100644 --- a/hphp/runtime/ext/ext_session.cpp +++ b/hphp/runtime/ext/ext_session.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/ext/ext_function.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/zend-math.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/request_local.h" #include "hphp/runtime/base/ini_setting.h" #include "hphp/runtime/base/datetime.h" diff --git a/hphp/runtime/ext/ext_soap.cpp b/hphp/runtime/ext/ext_soap.cpp index 6de3b2c6b..5e9f1de5c 100644 --- a/hphp/runtime/ext/ext_soap.cpp +++ b/hphp/runtime/ext/ext_soap.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/ext/soap/soap.h" #include "hphp/runtime/ext/soap/packet.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/ext/ext_zlib.h" #include "hphp/runtime/ext/ext_network.h" #include "hphp/runtime/ext/ext_array.h" diff --git a/hphp/runtime/ext/ext_socket.cpp b/hphp/runtime/ext/ext_socket.cpp index 8a138407f..b5b656fd0 100644 --- a/hphp/runtime/ext/ext_socket.cpp +++ b/hphp/runtime/ext/ext_socket.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_socket.h" #include "hphp/runtime/base/socket.h" -#include "hphp/runtime/base/ssl_socket.h" +#include "hphp/runtime/base/ssl-socket.h" #include "hphp/runtime/server/server_stats.h" #include diff --git a/hphp/runtime/ext/ext_stream.cpp b/hphp/runtime/ext/ext_stream.cpp index 5573e7626..3ea37a8ba 100644 --- a/hphp/runtime/ext/ext_stream.cpp +++ b/hphp/runtime/ext/ext_stream.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/ext/ext_network.h" #include "hphp/runtime/base/socket.h" #include "hphp/runtime/base/plain-file.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/zend-printf.h" #include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/stream-wrapper.h" diff --git a/hphp/runtime/ext/ext_string.cpp b/hphp/runtime/ext/ext_string.cpp index 0d5b21b59..df71969e4 100644 --- a/hphp/runtime/ext/ext_string.cpp +++ b/hphp/runtime/ext/ext_string.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/ext/ext_string.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/runtime/base/zend-url.h" #include "hphp/runtime/base/zend-printf.h" diff --git a/hphp/runtime/ext/ext_url.cpp b/hphp/runtime/ext/ext_url.cpp index f59871253..078c63719 100644 --- a/hphp/runtime/ext/ext_url.cpp +++ b/hphp/runtime/ext/ext_url.cpp @@ -16,9 +16,9 @@ */ #include "hphp/runtime/ext/ext_url.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/zend-url.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/ext/ext_curl.h" #include "hphp/runtime/ext/ext_string.h" #include "hphp/runtime/ext/ext_file.h" diff --git a/hphp/runtime/ext/mailparse/mime.h b/hphp/runtime/ext/mailparse/mime.h index 0b8ef1967..53e5506da 100644 --- a/hphp/runtime/ext/mailparse/mime.h +++ b/hphp/runtime/ext/mailparse/mime.h @@ -20,7 +20,7 @@ #include "hphp/runtime/base/base_includes.h" #include "hphp/runtime/ext/mailparse/rfc822.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" extern "C" { #include "mbfl/mbfl_convert.h" diff --git a/hphp/runtime/ext/mailparse/rfc822.cpp b/hphp/runtime/ext/mailparse/rfc822.cpp index c4bfac3fe..202d27876 100644 --- a/hphp/runtime/ext/mailparse/rfc822.cpp +++ b/hphp/runtime/ext/mailparse/rfc822.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/ext/mailparse/rfc822.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/runtime_error.h" #define YYFILL(n) if (YYCURSOR == YYLIMIT) goto stop diff --git a/hphp/runtime/ext/soap/encoding.cpp b/hphp/runtime/ext/soap/encoding.cpp index ba401bba0..8ada9f544 100644 --- a/hphp/runtime/ext/soap/encoding.cpp +++ b/hphp/runtime/ext/soap/encoding.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/soap/encoding.h" #include "hphp/runtime/ext/soap/soap.h" #include "hphp/runtime/ext/ext_soap.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/server/admin_request_handler.cpp b/hphp/runtime/server/admin_request_handler.cpp index a27348f28..d2dbf209f 100644 --- a/hphp/runtime/server/admin_request_handler.cpp +++ b/hphp/runtime/server/admin_request_handler.cpp @@ -29,9 +29,9 @@ #include "hphp/runtime/base/datetime.h" #include "hphp/runtime/base/memory_manager.h" #include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/base/shared_store_base.h" +#include "hphp/runtime/base/shared-store-base.h" #include "hphp/runtime/ext/mysql_stats.h" -#include "hphp/runtime/base/shared_store_stats.h" +#include "hphp/runtime/base/shared-store-stats.h" #include "hphp/runtime/vm/repo.h" #include "hphp/runtime/vm/jit/translator.h" #include "hphp/util/alloc.h" diff --git a/hphp/runtime/server/dynamic_content_cache.h b/hphp/runtime/server/dynamic_content_cache.h index 335016c04..71848b93d 100644 --- a/hphp/runtime/server/dynamic_content_cache.h +++ b/hphp/runtime/server/dynamic_content_cache.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_DYNAMIC_CONTENT_CACHE_H_ #define incl_HPHP_DYNAMIC_CONTENT_CACHE_H_ -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/util/mutex.h" namespace HPHP { diff --git a/hphp/runtime/server/http_request_handler.h b/hphp/runtime/server/http_request_handler.h index 3ab2e81aa..a68a44e6c 100644 --- a/hphp/runtime/server/http_request_handler.h +++ b/hphp/runtime/server/http_request_handler.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_HTTP_REQUEST_HANDLER_H_ #define incl_HPHP_HTTP_REQUEST_HANDLER_H_ -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/server/virtual_host.h" #include "hphp/runtime/server/access_log.h" #include "hphp/runtime/server/server.h" diff --git a/hphp/runtime/server/http_server.cpp b/hphp/runtime/server/http_server.cpp index 26ede1050..78d29bcab 100644 --- a/hphp/runtime/server/http_server.cpp +++ b/hphp/runtime/server/http_server.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/memory_manager.h" #include "hphp/runtime/base/program_functions.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/thread_init_fini.h" +#include "hphp/runtime/base/thread-init-fini.h" #include "hphp/runtime/debugger/debugger.h" #include "hphp/runtime/ext/ext_apc.h" #include "hphp/runtime/server/admin_request_handler.h" diff --git a/hphp/runtime/server/libevent_server_with_takeover.cpp b/hphp/runtime/server/libevent_server_with_takeover.cpp index 0a8aaec3a..f7f139771 100644 --- a/hphp/runtime/server/libevent_server_with_takeover.cpp +++ b/hphp/runtime/server/libevent_server_with_takeover.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/server/libevent_server_with_takeover.h" #include "hphp/util/logger.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include /* diff --git a/hphp/runtime/server/pagelet_server.cpp b/hphp/runtime/server/pagelet_server.cpp index 7b50c9a5c..2ad50dd21 100644 --- a/hphp/runtime/server/pagelet_server.cpp +++ b/hphp/runtime/server/pagelet_server.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/server/http_request_handler.h" #include "hphp/runtime/server/upload.h" #include "hphp/runtime/server/job_queue_vm_stack.h" -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/ext/ext_server.h" diff --git a/hphp/runtime/server/replay_transport.cpp b/hphp/runtime/server/replay_transport.cpp index 7a7a6e1e4..00a0d52db 100644 --- a/hphp/runtime/server/replay_transport.cpp +++ b/hphp/runtime/server/replay_transport.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/server/replay_transport.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/zend-functions.h" #include "hphp/runtime/base/zend-string.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/server/request_uri.cpp b/hphp/runtime/server/request_uri.cpp index 585d60ae2..49750360f 100644 --- a/hphp/runtime/server/request_uri.cpp +++ b/hphp/runtime/server/request_uri.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/server/transport.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/server/static_content_cache.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/server/server_stats.h b/hphp/runtime/server/server_stats.h index 760b508a6..32eea71d7 100644 --- a/hphp/runtime/server/server_stats.h +++ b/hphp/runtime/server/server_stats.h @@ -21,7 +21,7 @@ #include "hphp/util/thread_local.h" #include "curl/curl.h" #include -#include "hphp/runtime/base/shared_string.h" +#include "hphp/runtime/base/shared-string.h" #include "hphp/runtime/base/types.h" namespace HPHP { diff --git a/hphp/runtime/server/static_content_cache.h b/hphp/runtime/server/static_content_cache.h index 90d2a6543..f418aecc7 100644 --- a/hphp/runtime/server/static_content_cache.h +++ b/hphp/runtime/server/static_content_cache.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_STATIC_CONTENT_CACHE_H_ #define incl_HPHP_STATIC_CONTENT_CACHE_H_ -#include "hphp/runtime/base/string_buffer.h" +#include "hphp/runtime/base/string-buffer.h" #include "hphp/util/file_cache.h" namespace HPHP { diff --git a/hphp/runtime/server/transport.cpp b/hphp/runtime/server/transport.cpp index 7f307c050..55bdfc7b3 100644 --- a/hphp/runtime/server/transport.cpp +++ b/hphp/runtime/server/transport.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/server/upload.h" #include "hphp/runtime/server/server_stats.h" #include "hphp/runtime/base/file.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/runtime/base/datetime.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/url.h" diff --git a/hphp/runtime/server/upload.cpp b/hphp/runtime/server/upload.cpp index 9d49f020b..e63de4f3e 100644 --- a/hphp/runtime/server/upload.cpp +++ b/hphp/runtime/server/upload.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/base/zend-printf.h" #include "hphp/runtime/ext/ext_apc.h" #include "hphp/util/logger.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" using std::set; diff --git a/hphp/runtime/server/virtual_host.cpp b/hphp/runtime/server/virtual_host.cpp index 37bc52043..9c91f1abe 100644 --- a/hphp/runtime/server/virtual_host.cpp +++ b/hphp/runtime/server/virtual_host.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/base/preg.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/comparisons.h" -#include "hphp/runtime/base/string_util.h" +#include "hphp/runtime/base/string-util.h" #include "hphp/util/util.h" namespace HPHP { diff --git a/hphp/runtime/vm/backup-gc.cpp b/hphp/runtime/vm/backup-gc.cpp index 1dfd65dce..c62eee6a8 100644 --- a/hphp/runtime/vm/backup-gc.cpp +++ b/hphp/runtime/vm/backup-gc.cpp @@ -26,7 +26,7 @@ #include "hphp/util/timer.h" #include "hphp/util/trace.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/smart-allocator.h" #include "hphp/runtime/base/memory_manager.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/hphp_array.h" diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp index 97941bd5e..f85b60101 100644 --- a/hphp/runtime/vm/bytecode.cpp +++ b/hphp/runtime/vm/bytecode.cpp @@ -41,7 +41,7 @@ #include "hphp/util/util.h" #include "hphp/util/trace.h" #include "hphp/util/debug.h" -#include "hphp/runtime/base/stat_cache.h" +#include "hphp/runtime/base/stat-cache.h" #include "hphp/runtime/vm/debug/debug.h" #include "hphp/runtime/vm/hhbc.h" #include "hphp/runtime/vm/php-debug.h" diff --git a/hphp/runtime/vm/fixed-string-map.h b/hphp/runtime/vm/fixed-string-map.h index fe3f41012..a80f74751 100644 --- a/hphp/runtime/vm/fixed-string-map.h +++ b/hphp/runtime/vm/fixed-string-map.h @@ -18,7 +18,7 @@ #define incl_HPHP_FIXED_STRING_MAP_H_ #include "hphp/util/base.h" -#include "hphp/runtime/base/string_data.h" +#include "hphp/runtime/base/string-data.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/vm/indexed-string-map.h b/hphp/runtime/vm/indexed-string-map.h index fe4f8ae33..dae8c5c40 100644 --- a/hphp/runtime/vm/indexed-string-map.h +++ b/hphp/runtime/vm/indexed-string-map.h @@ -20,7 +20,7 @@ #include #include -#include "hphp/runtime/base/string_data.h" +#include "hphp/runtime/base/string-data.h" #include "hphp/runtime/vm/fixed-string-map.h" namespace HPHP { diff --git a/hphp/runtime/vm/jit/block.h b/hphp/runtime/vm/jit/block.h index ec7ba9ca0..2eb464770 100644 --- a/hphp/runtime/vm/jit/block.h +++ b/hphp/runtime/vm/jit/block.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_VM_BLOCK_H_ #define incl_HPHP_VM_BLOCK_H_ -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/jit/ir.h" #include "hphp/runtime/vm/jit/edge.h" #include "hphp/runtime/vm/jit/ir-instruction.h" diff --git a/hphp/runtime/vm/jit/cfg.h b/hphp/runtime/vm/jit/cfg.h index 86e376435..83d6e775d 100644 --- a/hphp/runtime/vm/jit/cfg.h +++ b/hphp/runtime/vm/jit/cfg.h @@ -19,7 +19,7 @@ #include -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/jit/block.h" #include "hphp/runtime/vm/jit/trace.h" diff --git a/hphp/runtime/vm/jit/code-gen.cpp b/hphp/runtime/vm/jit/code-gen.cpp index d3a88ec6c..4f94784a2 100755 --- a/hphp/runtime/vm/jit/code-gen.cpp +++ b/hphp/runtime/vm/jit/code-gen.cpp @@ -28,7 +28,7 @@ #include "hphp/runtime/base/comparisons.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/base/string_data.h" +#include "hphp/runtime/base/string-data.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/ext/ext_closure.h" #include "hphp/runtime/ext/ext_continuation.h" diff --git a/hphp/runtime/vm/jit/ir.cpp b/hphp/runtime/vm/jit/ir.cpp index 963a94c4b..fa8715d9e 100755 --- a/hphp/runtime/vm/jit/ir.cpp +++ b/hphp/runtime/vm/jit/ir.cpp @@ -27,7 +27,7 @@ #include "folly/Traits.h" #include "hphp/util/trace.h" -#include "hphp/runtime/base/string_data.h" +#include "hphp/runtime/base/string-data.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/base/stats.h" #include "hphp/runtime/vm/jit/cse.h" diff --git a/hphp/runtime/vm/jit/layout.h b/hphp/runtime/vm/jit/layout.h index 781ac32d9..83a52423b 100644 --- a/hphp/runtime/vm/jit/layout.h +++ b/hphp/runtime/vm/jit/layout.h @@ -16,7 +16,7 @@ #ifndef incl_HPHP_JIT_LAYOUT_H_ #define incl_HPHP_JIT_LAYOUT_H_ -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/jit/ir.h" #include "hphp/runtime/vm/jit/block.h" diff --git a/hphp/runtime/vm/jit/linear-scan.cpp b/hphp/runtime/vm/jit/linear-scan.cpp index 0ad839a01..21d91ae6a 100644 --- a/hphp/runtime/vm/jit/linear-scan.cpp +++ b/hphp/runtime/vm/jit/linear-scan.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/vm/jit/linear-scan.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/jit/ir-factory.h" #include "hphp/runtime/vm/jit/native-calls.h" #include "hphp/runtime/vm/jit/print.h" diff --git a/hphp/runtime/vm/jit/normalized-instruction.h b/hphp/runtime/vm/jit/normalized-instruction.h index 0fc3544ea..2d452e8b6 100644 --- a/hphp/runtime/vm/jit/normalized-instruction.h +++ b/hphp/runtime/vm/jit/normalized-instruction.h @@ -20,7 +20,7 @@ #include -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/bytecode.h" #include "hphp/runtime/vm/srckey.h" #include "hphp/runtime/vm/jit/type.h" diff --git a/hphp/runtime/vm/jit/print.cpp b/hphp/runtime/vm/jit/print.cpp index 8de10f1ef..7589473e3 100644 --- a/hphp/runtime/vm/jit/print.cpp +++ b/hphp/runtime/vm/jit/print.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/vm/jit/print.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/jit/ir.h" #include "hphp/runtime/vm/jit/linear-scan.h" #include "hphp/runtime/vm/jit/code-gen.h" diff --git a/hphp/runtime/vm/jit/region-method.cpp b/hphp/runtime/vm/jit/region-method.cpp index 913bb2d0a..68c380d79 100644 --- a/hphp/runtime/vm/jit/region-method.cpp +++ b/hphp/runtime/vm/jit/region-method.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ #include "hphp/util/arena.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/jit/region-selection.h" #include "hphp/runtime/vm/verifier/cfg.h" diff --git a/hphp/runtime/vm/jit/region-onebc.cpp b/hphp/runtime/vm/jit/region-onebc.cpp index e11dc5428..76ea03ca7 100644 --- a/hphp/runtime/vm/jit/region-onebc.cpp +++ b/hphp/runtime/vm/jit/region-onebc.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/vm/jit/region-selection.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/jit/region-selection.h b/hphp/runtime/vm/jit/region-selection.h index 22712c40a..35922e8d6 100644 --- a/hphp/runtime/vm/jit/region-selection.h +++ b/hphp/runtime/vm/jit/region-selection.h @@ -23,7 +23,7 @@ #include "folly/Format.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/srckey.h" #include "hphp/runtime/vm/jit/type.h" #include "hphp/runtime/vm/jit/types.h" diff --git a/hphp/runtime/vm/jit/simplifier.cpp b/hphp/runtime/vm/jit/simplifier.cpp index 1cb0a0455..d8c46d97e 100644 --- a/hphp/runtime/vm/jit/simplifier.cpp +++ b/hphp/runtime/vm/jit/simplifier.cpp @@ -19,7 +19,7 @@ #include #include -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/base/type-conversions.h" #include "hphp/runtime/vm/jit/trace-builder.h" #include "hphp/runtime/vm/hhbc.h" diff --git a/hphp/runtime/vm/jit/simplifier.h b/hphp/runtime/vm/jit/simplifier.h index e1ad0a0f7..8d81cef26 100644 --- a/hphp/runtime/vm/jit/simplifier.h +++ b/hphp/runtime/vm/jit/simplifier.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_HHVM_HHIR_SIMPLIFIER_H_ #define incl_HPHP_HHVM_HHIR_SIMPLIFIER_H_ -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/jit/cse.h" #include "hphp/runtime/vm/jit/ir.h" diff --git a/hphp/runtime/vm/jit/state-vector.h b/hphp/runtime/vm/jit/state-vector.h index b85daa078..be79ab065 100644 --- a/hphp/runtime/vm/jit/state-vector.h +++ b/hphp/runtime/vm/jit/state-vector.h @@ -19,7 +19,7 @@ #include -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/jit/ir-factory.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/jit/translator-x64.h b/hphp/runtime/vm/jit/translator-x64.h index 06d0ea443..108c09385 100644 --- a/hphp/runtime/vm/jit/translator-x64.h +++ b/hphp/runtime/vm/jit/translator-x64.h @@ -29,7 +29,7 @@ #include "hphp/runtime/vm/debug/debug.h" #include "hphp/runtime/vm/jit/abi-x64.h" #include "hphp/runtime/vm/jit/tracelet.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" namespace HPHP { class ExecutionContext; } diff --git a/hphp/runtime/vm/jit/translator.h b/hphp/runtime/vm/jit/translator.h index 42c470258..5f9e04a80 100644 --- a/hphp/runtime/vm/jit/translator.h +++ b/hphp/runtime/vm/jit/translator.h @@ -30,7 +30,7 @@ #include "hphp/util/hash.h" #include "hphp/util/timer.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/base/smart_containers.h" +#include "hphp/runtime/base/smart-containers.h" #include "hphp/runtime/vm/bytecode.h" #include "hphp/runtime/vm/jit/fixup.h" #include "hphp/runtime/vm/jit/runtime-type.h" diff --git a/hphp/runtime/vm/object-allocator-sizes.cpp b/hphp/runtime/vm/object-allocator-sizes.cpp index 4760ced06..0ba866f63 100644 --- a/hphp/runtime/vm/object-allocator-sizes.cpp +++ b/hphp/runtime/vm/object-allocator-sizes.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/vm/object-allocator-sizes.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/object_data.h" -#include "hphp/runtime/base/smart_allocator.h" +#include "hphp/runtime/base/smart-allocator.h" namespace HPHP { diff --git a/hphp/test/ext/test.cpp b/hphp/test/ext/test.cpp index fc48e7713..bbaf8715a 100644 --- a/hphp/test/ext/test.cpp +++ b/hphp/test/ext/test.cpp @@ -15,7 +15,7 @@ */ #include "hphp/test/ext/test.h" -#include "hphp/runtime/base/shared_store_base.h" +#include "hphp/runtime/base/shared-store-base.h" #include "hphp/compiler/option.h" using namespace HPHP; diff --git a/hphp/test/ext/test_cpp_base.cpp b/hphp/test/ext/test_cpp_base.cpp index 5bbc45f37..7733730d5 100644 --- a/hphp/test/ext/test_cpp_base.cpp +++ b/hphp/test/ext/test_cpp_base.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/ext/ext_apc.h" #include "hphp/runtime/ext/ext_mysql.h" #include "hphp/runtime/ext/ext_curl.h" -#include "hphp/runtime/base/shared_store_base.h" +#include "hphp/runtime/base/shared-store-base.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/server/ip_block_map.h" #include "hphp/test/ext/test_mysql_info.h" diff --git a/hphp/test/ext/test_util.cpp b/hphp/test/ext/test_util.cpp index f6abd5aac..5403382a7 100644 --- a/hphp/test/ext/test_util.cpp +++ b/hphp/test/ext/test_util.cpp @@ -17,7 +17,7 @@ #include "hphp/test/ext/test_util.h" #include "hphp/util/logger.h" #include "hphp/runtime/base/complex_types.h" -#include "hphp/runtime/base/shared_string.h" +#include "hphp/runtime/base/shared-string.h" #include "hphp/runtime/base/zend-string.h" #define VERIFY_DUMP(map, exp) \