commit 9d6f537fd8e7d7aea1a21613cabbc47db76cc907
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 15 23:13:02 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 15 23:13:02 2017 +0000
tree 5bb99e11187ae5aa3c35a859ff1248e449469936
parent 71df3d8bca816d0e4cdcda4b878e0665bcab360b
parent 63ae32b8e2980e77e189ff4d8818a8f75a03f663

Merge "libbacktrace: make Backtrace::FormatFrameData static."

libbacktrace/include/backtrace/Backtrace.h

diff --git a/libbacktrace/include/backtrace/Backtrace.h b/libbacktrace/include/backtrace/Backtrace.h
index d67ea50..289fd0c 100644
--- a/libbacktrace/include/backtrace/Backtrace.h
+++ b/libbacktrace/include/backtrace/Backtrace.h
@@ -127,7 +127,7 @@
   // Create a string representing the formatted line of backtrace information
   // for a single frame.
   virtual std::string FormatFrameData(size_t frame_num);
-  virtual std::string FormatFrameData(const backtrace_frame_data_t* frame);
+  static std::string FormatFrameData(const backtrace_frame_data_t* frame);
 
   pid_t Pid() const { return pid_; }
   pid_t Tid() const { return tid_; }