diff options
author | 2014-10-14 17:41:57 -0700 | |
---|---|---|
committer | 2014-10-16 19:27:28 -0700 | |
commit | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (patch) | |
tree | f7a20779e4d665f948c5fbcd26dac0071dafb8d4 /runtime/utils.h | |
parent | 2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4 (diff) |
Make ART compile with GCC -O0 again.
Tidy up InstructionSetFeatures so that it has a type hierarchy dependent on
architecture.
Add to instruction_set_test to warn when InstructionSetFeatures don't agree
with ones from system properties, AT_HWCAP and /proc/cpuinfo.
Clean-up class linker entry point logic to not return entry points but to
test whether the passed code is the particular entrypoint. This works around
image trampolines that replicate entrypoints.
Bug: 17993736
Change-Id: I5f4b49e88c3b02a79f9bee04f83395146ed7be23
Diffstat (limited to 'runtime/utils.h')
-rw-r--r-- | runtime/utils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/utils.h b/runtime/utils.h index 53b49c8fd4..b7daa64d90 100644 --- a/runtime/utils.h +++ b/runtime/utils.h @@ -380,13 +380,13 @@ void InitTimeSpec(bool absolute, int clock, int64_t ms, int32_t ns, timespec* ts // Splits a string using the given separator character into a vector of // strings. Empty strings will be omitted. -void Split(const std::string& s, char separator, std::vector<std::string>& result); +void Split(const std::string& s, char separator, std::vector<std::string>* result); // Trims whitespace off both ends of the given string. -std::string Trim(std::string s); +std::string Trim(const std::string& s); // Joins a vector of strings into a single string, using the given separator. -template <typename StringT> std::string Join(std::vector<StringT>& strings, char separator); +template <typename StringT> std::string Join(const std::vector<StringT>& strings, char separator); // Returns the calling thread's tid. (The C libraries don't expose this.) pid_t GetTid(); |