commit 08661c7c5e218dedcc61874e66c4a4d523b0d9b8
author Brian Silverman <brians> Sun Sep 01 17:24:38 2013 -0700
committer Brian Silverman <brians> Fri Sep 13 14:26:55 2013 -0700
tree a9cd4c6fac9a9b159ff6fe0ca27f39d178ca6e62
parent a6d1b562132716a750ee4c05a284cf5b244500b3

got all of the code to actually compile again

I don't think it actually works though.

aos/atom_code/logging/atom_logging.cc

diff --git a/aos/atom_code/logging/atom_logging.cc b/aos/atom_code/logging/atom_logging.cc
index 6ea3b24..854da17 100644
--- a/aos/atom_code/logging/atom_logging.cc
+++ b/aos/atom_code/logging/atom_logging.cc
@@ -17,8 +17,6 @@
 #include "aos/atom_code/thread_local.h"
 #include "aos/atom_code/ipc_lib/queue.h"
 
-using ::aos::Queue;
-
 namespace aos {
 namespace logging {
 namespace {
@@ -55,7 +53,7 @@
   return process_name + '.' + thread_name;
 }
 
-static Queue *queue;
+RawQueue *queue;
 
 }  // namespace
 namespace internal {
@@ -100,7 +98,7 @@
 void Register() {
   Init();
 
-  queue = Queue::Fetch("LoggingQueue", sizeof(LogMessage), 1323, 1500);
+  queue = RawQueue::Fetch("LoggingQueue", sizeof(LogMessage), 1323, 1500);
   if (queue == NULL) {
     Die("logging: couldn't fetch queue\n");
   }
@@ -113,7 +111,7 @@
 }
 
 const LogMessage *ReadNext() {
-  return ReadNext(Queue::kBlock);
+  return ReadNext(RawQueue::kBlock);
 }
 
 const LogMessage *ReadNext(int flags) {
@@ -121,7 +119,7 @@
   do {
     r = static_cast<const LogMessage *>(queue->ReadMessage(flags));
     // not blocking means return a NULL if that's what it gets
-  } while ((flags & Queue::kBlock) && r == NULL);
+  } while ((flags & RawQueue::kBlock) && r == NULL);
   return r;
 }
 
@@ -134,7 +132,7 @@
 }
 
 void Write(LogMessage *msg) {
-  if (!queue->WriteMessage(msg, Queue::kOverride)) {
+  if (!queue->WriteMessage(msg, RawQueue::kOverride)) {
     LOG(FATAL, "writing failed");
   }
 }