Mojo Log service and a thread-safe client library.

mojo/public/cpp/bindings/lib/message_builder.cc

Index: mojo/public/cpp/bindings/lib/message_builder.cc
diff --git a/mojo/public/cpp/bindings/lib/message_builder.cc b/mojo/public/cpp/bindings/lib/message_builder.cc
index 25f1862e47ea8b1fba531f70cd5a0ebbd7eaa332..b2404a8a00c4c0a5c144c552e8b4a4af52b2b9c0 100644
--- a/mojo/public/cpp/bindings/lib/message_builder.cc
+++ b/mojo/public/cpp/bindings/lib/message_builder.cc
@@ -8,14 +8,20 @@
 #include "mojo/public/cpp/bindings/message.h"
 
 namespace mojo {
-namespace internal {
+
+namespace {
+
+using internal::MessageHeader;
+using internal::MessageHeaderWithRequestID;
 
 template <typename Header>
-void Allocate(Buffer* buf, Header** header) {
+void Allocate(internal::Buffer* buf, Header** header) {
   *header = static_cast<Header*>(buf->Allocate(sizeof(Header)));
   (*header)->num_bytes = sizeof(Header);
 }
 
+}  // namespace
+
 MessageBuilder::MessageBuilder(uint32_t name, size_t payload_size) {
   Initialize(sizeof(MessageHeader) + payload_size);
 
@@ -23,6 +29,7 @@ MessageBuilder::MessageBuilder(uint32_t name, size_t payload_size) {
   Allocate(&buf_, &header);
   header->version = 0;
   header->name = name;
+  header->flags = 0;
 }
 
 MessageBuilder::~MessageBuilder() {
@@ -31,7 +38,7 @@ MessageBuilder::~MessageBuilder() {
 MessageBuilder::MessageBuilder() {}
 
 void MessageBuilder::Initialize(size_t size) {
-  message_.AllocData(static_cast<uint32_t>(Align(size)));
+  message_.AllocData(static_cast<uint32_t>(internal::Align(size)));
   buf_.Initialize(message_.mutable_data(), message_.data_num_bytes());
 }
 
@@ -48,5 +55,4 @@ MessageWithRequestIDBuilder::MessageWithRequestIDBuilder(uint32_t name,
   header->request_id = request_id;
 }
 
-}  // namespace internal
 }  // namespace mojo