commit 2b659e6e2535d33c88e46b8da4478cf69e90155a
author Yi Kong <yikong@google.com> Mon Mar 25 13:19:30 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Mar 25 13:19:30 2019 -0700
tree 0f02257ef2036197a72fe3cdabee48f4383c4af7
parent d2d6fad267cf9a2bc1d4d95ba3d1fe0a4248012b
parent 06bec5f0960f130bd05babb7624980668311ade5

Merge "[libbacktrace] Modernize code to use override keyword" am: 9b1f1ee4cc
am: 280caf2e20

Change-Id: I018e4dc5e1d2703061d7813625e45107e2d3e8d1

libbacktrace/UnwindStack.h

diff --git a/libbacktrace/UnwindStack.h b/libbacktrace/UnwindStack.h
index 33c4282..4ec591d 100644
--- a/libbacktrace/UnwindStack.h
+++ b/libbacktrace/UnwindStack.h
@@ -58,7 +58,7 @@
 
   bool Unwind(size_t num_ignore_frames, void* context) override;
 
-  std::string GetFunctionNameRaw(uint64_t pc, uint64_t* offset);
+  std::string GetFunctionNameRaw(uint64_t pc, uint64_t* offset) override;
 
   size_t Read(uint64_t addr, uint8_t* buffer, size_t bytes) override;