diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-08-05 13:11:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-05 13:11:42 +0000 |
| commit | 34f9b1e9f227dccafff52a7bb3e95d240c35ba2e (patch) | |
| tree | 7c70f7a9059d26dcf327dfbbe326d20ab89301c5 /libbacktrace | |
| parent | ec5e5979227124cb0b1866c05bdf5190a33c0706 (diff) | |
| parent | 2ea89b631d58ecd8edd7165ed8840d1e1047aa72 (diff) | |
| download | core-34f9b1e9f227dccafff52a7bb3e95d240c35ba2e.tar.gz core-34f9b1e9f227dccafff52a7bb3e95d240c35ba2e.tar.bz2 core-34f9b1e9f227dccafff52a7bb3e95d240c35ba2e.zip | |
am 2ea89b63: am 936a236b: Merge "Add uncached argument to BacktraceMap::Create on darwin"
* commit '2ea89b631d58ecd8edd7165ed8840d1e1047aa72':
Add uncached argument to BacktraceMap::Create on darwin
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/BacktraceMap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbacktrace/BacktraceMap.cpp b/libbacktrace/BacktraceMap.cpp index 0056f4bba..f38e48415 100644 --- a/libbacktrace/BacktraceMap.cpp +++ b/libbacktrace/BacktraceMap.cpp @@ -137,7 +137,7 @@ bool BacktraceMap::Build() { #if defined(__APPLE__) // Corkscrew and libunwind don't compile on the mac, so create a generic // map object. -BacktraceMap* BacktraceMap::Create(pid_t pid) { +BacktraceMap* BacktraceMap::Create(pid_t pid, bool uncached) { BacktraceMap* map = new BacktraceMap(pid); if (!map->Build()) { delete map; |