commit c203a76fa4008f3dd0b0fa8105953aed49bc7872
author Hector Dearman <hjd@google.com> Wed Jun 20 16:25:36 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 20 16:25:36 2018 +0000
tree ee1604340378f4439638e228e2e1f4d3cee26203
parent d1e319e0323e514521f7e43204cb6bad1cd040a1
parent a0eb1a47b308c02ebb7e01bcb48a0894bf1a8c9e

Merge "perfetto: Fix two small build issues."

include/perfetto/base/BUILD.gn

diff --git a/include/perfetto/base/BUILD.gn b/include/perfetto/base/BUILD.gn
index 41f075d..908baf4 100644
--- a/include/perfetto/base/BUILD.gn
+++ b/include/perfetto/base/BUILD.gn
@@ -24,6 +24,7 @@
     "string_splitter.h",
     "string_utils.h",
     "task_runner.h",
+    "temp_file.h",
     "thread_checker.h",
     "time.h",
     "unix_task_runner.h",

src/base/watchdog_posix.cc

diff --git a/src/base/watchdog_posix.cc b/src/base/watchdog_posix.cc
index 9864e7b..5f8755f 100644
--- a/src/base/watchdog_posix.cc
+++ b/src/base/watchdog_posix.cc
@@ -247,7 +247,7 @@
   }
 }
 
-Watchdog::Timer::Timer(Timer&& other) {
+Watchdog::Timer::Timer(Timer&& other) noexcept {
   timerid_ = other.timerid_;
   other.timerid_ = nullptr;
 }