Mojo: COMPILE_ASSERT -> static_assert in mojo/system and mojo/embedder.

mojo/system/message_in_transit.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/system/message_in_transit.h"
 
 #include <string.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
 STATIC_CONST_MEMBER_DEFINITION const MessageInTransit::Subtype
     MessageInTransit::kSubtypeChannelRemoveMessagePipeEndpointAck;
 STATIC_CONST_MEMBER_DEFINITION const MessageInTransit::Subtype
     MessageInTransit::kSubtypeRawChannelPosixExtraPlatformHandles;
 STATIC_CONST_MEMBER_DEFINITION const MessageInTransit::EndpointId
     MessageInTransit::kInvalidEndpointId;
 STATIC_CONST_MEMBER_DEFINITION const size_t MessageInTransit::kMessageAlignment;
 
 struct MessageInTransit::PrivateStructForCompileAsserts {
   // The size of |Header| must be a multiple of the alignment.
-  COMPILE_ASSERT(sizeof(Header) % kMessageAlignment == 0,
-                 sizeof_MessageInTransit_Header_invalid);
+  static_assert(sizeof(Header) % kMessageAlignment == 0,
+                "sizeof(MessageInTransit::Header) invalid");
   // Avoid dangerous situations, but making sure that the size of the "header" +
   // the size of the data fits into a 31-bit number.
-  COMPILE_ASSERT(static_cast<uint64_t>(sizeof(Header)) + kMaxMessageNumBytes <=
-                     0x7fffffffULL,
-                 kMaxMessageNumBytes_too_big);
+  static_assert(static_cast<uint64_t>(sizeof(Header)) + kMaxMessageNumBytes <=
+                    0x7fffffffULL,
+                "kMaxMessageNumBytes too big");
 
   // We assume (to avoid extra rounding code) that the maximum message (data)
   // size is a multiple of the alignment.
-  COMPILE_ASSERT(kMaxMessageNumBytes % kMessageAlignment == 0,
-                 kMessageAlignment_not_a_multiple_of_alignment);
+  static_assert(kMaxMessageNumBytes % kMessageAlignment == 0,
+                "kMessageAlignment not a multiple of alignment");
 };
 
 MessageInTransit::View::View(size_t message_size, const void* buffer)
     : buffer_(buffer) {
   size_t next_message_size = 0;
   DCHECK(MessageInTransit::GetNextMessageSize(
       buffer_, message_size, &next_message_size));
   DCHECK_EQ(message_size, next_message_size);
   // This should be equivalent.
   DCHECK_EQ(message_size, total_size());
@@ skipping 152 matching lines @@
   DCHECK_EQ(main_buffer_size_ % kMessageAlignment, 0u);
   header()->total_size = static_cast<uint32_t>(main_buffer_size_);
   if (transport_data_) {
     header()->total_size +=
         static_cast<uint32_t>(transport_data_->buffer_size());
   }
 }
 
 }  // namespace system
 }  // namespace mojo