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

mojo/system/options_validation.h

 // Copyright 2014 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.
 
 // Functions to help with verifying various |Mojo...Options| structs from the
 // (public, C) API. These are "extensible" structs, which all have |struct_size|
 // as their first member. All fields (other than |struct_size|) are optional,
 // but any |flags| specified must be known to the system (otherwise, an error of
 // |MOJO_RESULT_UNIMPLEMENTED| should be returned).
 
@@ skipping 19 matching lines @@
 class UserOptionsReader {
  public:
   // Constructor from a |UserPointer<const Options>| (which it checks -- this
   // constructor has side effects!).
   // Note: We initialize |options_reader_| without checking, since we do a check
   // in |GetSizeForReader()|.
   explicit UserOptionsReader(UserPointer<const Options> options)
       : options_reader_(UserPointer<const char>::Reader::NoCheck(),
                         options.template ReinterpretCast<const char>(),
                         GetSizeForReader(options)) {
-    COMPILE_ASSERT(offsetof(Options, struct_size) == 0,
-                   Options_struct_size_not_first_member);
-    // TODO(vtl): With C++11, compile-assert that |sizeof(Options::struct_size)
-    // == sizeof(uint32_t)| somewhere.
+    static_assert(offsetof(Options, struct_size) == 0,
+                  "struct_size not first member of Options");
+    // TODO(vtl): Enable when MSVC supports this (C++11 extended sizeof):
+    //   static_assert(sizeof(Options::struct_size) == sizeof(uint32_t),
+    //                 "Options::struct_size not a uint32_t");
+    // (Or maybe assert that its type is uint32_t?)
   }
 
   bool is_valid() const { return !!options_reader_.GetPointer(); }
 
   const Options& options() const {
     DCHECK(is_valid());
     return *reinterpret_cast<const Options*>(options_reader_.GetPointer());
   }
 
   // Checks that the given (variable-size) |options| passed to the constructor
@@ skipping 38 matching lines @@
 // TODO(vtl): With C++11, use |sizeof(Options::member)| instead of (the
 // contortion below). We might also be able to pull out the type |Options| from
 // |reader| (using |decltype|) instead of requiring a parameter.
 #define OPTIONS_STRUCT_HAS_MEMBER(Options, member, reader) \
   reader.HasMember(offsetof(Options, member), sizeof(reader.options().member))
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_SYSTEM_OPTIONS_VALIDATION_H_