diff options
author | Andreas Gampe <agampe@google.com> | 2014-03-05 16:46:44 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-03-05 16:46:44 -0800 |
commit | 39d921865c207bd315daa372759e75b454cbcae1 (patch) | |
tree | 122aa731726ebcf1c1dc2c7668cd0a20fa45bdcf /runtime/parsed_options.h | |
parent | c050485355f594681e045f84b477c74a2f0d7f9e (diff) | |
download | android_art-39d921865c207bd315daa372759e75b454cbcae1.tar.gz android_art-39d921865c207bd315daa372759e75b454cbcae1.tar.bz2 android_art-39d921865c207bd315daa372759e75b454cbcae1.zip |
Size and offset fixes to compile for 64b host
Some Runtime fields have moved after deletion of other fields.
ParsedOptions uses size_t, but parsing function works on unsigned int.
Change-Id: I6b7f25787af5d3f9e38554abea2bfb220299f475
Diffstat (limited to 'runtime/parsed_options.h')
-rw-r--r-- | runtime/parsed_options.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/runtime/parsed_options.h b/runtime/parsed_options.h index 0af17eef8a..f07bba1240 100644 --- a/runtime/parsed_options.h +++ b/runtime/parsed_options.h @@ -44,8 +44,8 @@ class ParsedOptions { bool verify_post_gc_heap_; bool verify_pre_gc_rosalloc_; bool verify_post_gc_rosalloc_; - size_t long_pause_log_threshold_; - size_t long_gc_log_threshold_; + unsigned int long_pause_log_threshold_; + unsigned int long_gc_log_threshold_; bool dump_gc_performance_on_shutdown_; bool ignore_max_footprint_; size_t heap_initial_size_; @@ -54,18 +54,18 @@ class ParsedOptions { size_t heap_min_free_; size_t heap_max_free_; double heap_target_utilization_; - size_t parallel_gc_threads_; - size_t conc_gc_threads_; + unsigned int parallel_gc_threads_; + unsigned int conc_gc_threads_; gc::CollectorType collector_type_; gc::CollectorType background_collector_type_; size_t stack_size_; - size_t max_spins_before_thin_lock_inflation_; + unsigned int max_spins_before_thin_lock_inflation_; bool low_memory_mode_; - size_t lock_profiling_threshold_; + unsigned int lock_profiling_threshold_; std::string stack_trace_file_; bool method_trace_; std::string method_trace_file_; - size_t method_trace_file_size_; + unsigned int method_trace_file_size_; bool (*hook_is_sensitive_thread_)(); jint (*hook_vfprintf_)(FILE* stream, const char* format, va_list ap); void (*hook_exit_)(jint status); |