commit 58899fd98e864b2d76d3610212b2b19be318ca87
author Brian Silverman <bsilver16384@gmail.com> Sun Mar 24 11:03:11 2019 -0700
committer Brian Silverman <bsilver16384@gmail.com> Sun Mar 24 16:13:36 2019 -0700
tree 8d6a17c1e4ce966a1c620afa4ffed5ddb4b47059
parent a67b697eebaf2a9bf0c0bd9131dfe2895b36a469

Convert things from AOS logging to glog

This is necessary so ceres (which includes glog) can be included in more
places.

Change-Id: Ie0a54dc6a9e21e0c2f11899d08c87d08c5c0e028

aos/vision/events/BUILD

diff --git a/aos/vision/events/BUILD b/aos/vision/events/BUILD
index c05fc09..b887872 100644
--- a/aos/vision/events/BUILD
+++ b/aos/vision/events/BUILD
@@ -69,6 +69,7 @@
     srcs = ["gtk_event.cc"],
     deps = [
         ":epoll_events",
+        "//aos/logging",
         "@usr_repo//:gtk+-3.0",
     ],
 )

aos/vision/events/epoll_events.cc

diff --git a/aos/vision/events/epoll_events.cc b/aos/vision/events/epoll_events.cc
index 0043b78..f6cba76 100644
--- a/aos/vision/events/epoll_events.cc
+++ b/aos/vision/events/epoll_events.cc
@@ -12,6 +12,18 @@
 namespace aos {
 namespace events {
 
+void EpollEvent::DirectEvent(uint32_t events) {
+  if ((events & ~(EPOLLIN | EPOLLPRI | EPOLLERR)) != 0) {
+    LOG(FATAL, "unexpected epoll events set in %x on %d\n", events, fd());
+  }
+  ReadEvent();
+}
+
+void EpollEvent::SetEvents(uint32_t events) {
+  events_ |= events;
+  CHECK(!loop_);
+}
+
 EpollLoop::EpollLoop() : epoll_fd_(PCHECK(epoll_create1(0))) {}
 
 void EpollLoop::Add(EpollEvent *event) {

aos/vision/events/epoll_events.h

diff --git a/aos/vision/events/epoll_events.h b/aos/vision/events/epoll_events.h
index 19851ed..c7aa1c6 100644
--- a/aos/vision/events/epoll_events.h
+++ b/aos/vision/events/epoll_events.h
@@ -75,20 +75,11 @@
   virtual void ReadEvent() = 0;
 
   // Handle Events directly from epoll.
-  virtual void DirectEvent(uint32_t events) {
-    if ((events & ~(EPOLLIN | EPOLLPRI | EPOLLERR)) != 0) {
-      LOG(FATAL, "unexpected epoll events set in %x on %d\n",
-          events, fd());
-    }
-    ReadEvent();
-  }
+  virtual void DirectEvent(uint32_t events);
 
   EpollLoop *loop() { return loop_; }
 
-  void SetEvents(uint32_t events) {
-    events_ |= events;
-    CHECK(!loop_);
-  }
+  void SetEvents(uint32_t events);
 
   uint32_t events() const { return events_; }
 

aos/vision/events/gtk_event.cc

diff --git a/aos/vision/events/gtk_event.cc b/aos/vision/events/gtk_event.cc
index 0c518e0..4ff9fde 100644
--- a/aos/vision/events/gtk_event.cc
+++ b/aos/vision/events/gtk_event.cc
@@ -6,6 +6,7 @@
 #include <thread>
 
 #include "aos/vision/events/epoll_events.h"
+#include "aos/logging/logging.h"
 
 namespace aos {
 namespace events {