copying over queue-api-redo branch from my 2012 repo
This commit is not cleanly separated from the next one where I got
everything to compile again (and possibly even further on from there).
diff --git a/aos/common/messages/QueueHolder.h b/aos/common/messages/QueueHolder.h
index 23ddc95..8d8ba51 100644
--- a/aos/common/messages/QueueHolder.h
+++ b/aos/common/messages/QueueHolder.h
@@ -71,7 +71,7 @@
#define aos_check_rv __attribute__((warn_unused_result))
template<typename T> class QueueHolderNoBuilder {
#ifndef __VXWORKS__
- aos_queue *const queue_;
+ Queue *const queue_;
static_assert(shm_ok<T>::value, "T must be able to"
" go through shared memory and memcpy");
T t_;
@@ -80,7 +80,7 @@
#endif
public:
#ifndef __VXWORKS__
- explicit QueueHolderNoBuilder(aos_queue *queue) : queue_(queue) {}
+ explicit QueueHolderNoBuilder(Queue *queue) : queue_(queue) {}
#else
QueueHolderNoBuilder() {}
#endif
@@ -158,7 +158,7 @@
QueueBuilder<T> builder_;
public:
#ifndef __VXWORKS__
- explicit QueueHolder(aos_queue *queue) : QueueHolderNoBuilder<T>(queue),
+ explicit QueueHolder(Queue *queue) : QueueHolderNoBuilder<T>(queue),
builder_(*this) {}
#else
QueueHolder() : builder_(*this) {}
@@ -171,7 +171,6 @@
}
};
-} // namespace aos
+} // namespace aos
#endif
-