Use std::is_same to check for identical types.

mojo/edk/system/ipc_support.cc

 // Copyright 2015 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/edk/system/ipc_support.h"
 
+#include <type_traits>
+
 #include "base/logging.h"
 #include "mojo/edk/embedder/master_process_delegate.h"
 #include "mojo/edk/embedder/slave_process_delegate.h"
 #include "mojo/edk/system/channel_manager.h"
 #include "mojo/edk/system/master_connection_manager.h"
 #include "mojo/edk/system/message_pipe_dispatcher.h"
 #include "mojo/edk/system/slave_connection_manager.h"
 
 namespace mojo {
 namespace system {
@@ skipping 72 matching lines @@
 scoped_refptr<system::MessagePipeDispatcher> IPCSupport::ConnectToSlave(
     const ConnectionIdentifier& connection_id,
     embedder::SlaveInfo slave_info,
     embedder::ScopedPlatformHandle platform_handle,
     const base::Closure& callback,
     scoped_refptr<base::TaskRunner> callback_thread_task_runner,
     ChannelId* channel_id) {
   DCHECK(channel_id);
 
   // We rely on |ChannelId| and |ProcessIdentifier| being identical types.
-  // TODO(vtl): Use std::is_same instead when we are allowed to (C++11 library).
-  static_assert(sizeof(ChannelId) == sizeof(ProcessIdentifier),
+  static_assert(std::is_same<ChannelId, ProcessIdentifier>::value,
                 "ChannelId and ProcessIdentifier types don't match");
 
   embedder::ScopedPlatformHandle platform_connection_handle =
       ConnectToSlaveInternal(connection_id, slave_info, platform_handle.Pass(),
                              channel_id);
   return channel_manager()->CreateChannel(
       *channel_id, platform_connection_handle.Pass(), callback,
       callback_thread_task_runner);
 }
 
 scoped_refptr<system::MessagePipeDispatcher> IPCSupport::ConnectToMaster(
     const ConnectionIdentifier& connection_id,
     const base::Closure& callback,
     scoped_refptr<base::TaskRunner> callback_thread_task_runner,
     ChannelId* channel_id) {
   DCHECK(channel_id);
 
-  // TODO(vtl): Use std::is_same instead when we are allowed to (C++11 library).
-  static_assert(sizeof(ChannelId) == sizeof(ProcessIdentifier),
+  static_assert(std::is_same<ChannelId, ProcessIdentifier>::value,
                 "ChannelId and ProcessIdentifier types don't match");
   embedder::ScopedPlatformHandle platform_connection_handle =
       ConnectToMasterInternal(connection_id);
   *channel_id = kMasterProcessIdentifier;
   return channel_manager()->CreateChannel(
       *channel_id, platform_connection_handle.Pass(), callback,
       callback_thread_task_runner);
 }
 
 embedder::ScopedPlatformHandle IPCSupport::ConnectToSlaveInternal(
@@ skipping 30 matching lines @@
   CHECK_EQ(connection_manager()->Connect(connection_id, &peer_id, &is_first,
                                          &platform_connection_handle),
            ConnectionManager::Result::SUCCESS_CONNECT_NEW_CONNECTION);
   DCHECK_EQ(peer_id, system::kMasterProcessIdentifier);
   DCHECK(platform_connection_handle.is_valid());
   return platform_connection_handle;
 }
 
 }  // namespace system
 }  // namespace mojo