GCC 4.6 warnings cleanup

securemem.h

 // Copyright (c) 2010 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.
 
 #ifndef SECURE_MEM_H__
 #define SECURE_MEM_H__
 
 #include <stdlib.h>
 #include "linux_syscall_support.h"
 
@@ skipping 150 matching lines @@
     // of safety, e.g. for thread exit.
     SEND_LOCKED_SYNC,
   };
 
   // Sends a system call to the trusted thread for execution.
   static void sendSystemCall(const SyscallRequestInfo& rpc, LockType type) {
     sendSystemCallInternal(rpc, type);
   }
   template<class T1> static
   void sendSystemCall(const SyscallRequestInfo& rpc, LockType type, T1 arg1) {
-    sendSystemCallInternal(rpc, type, (void*)arg1);
+    sendSystemCallInternal(rpc, type, reinterpret_cast<void*>(arg1));
   }
   template<class T1, class T2> static
   void sendSystemCall(const SyscallRequestInfo& rpc, LockType type,
                       T1 arg1, T2 arg2) {
-    sendSystemCallInternal(rpc, type, (void*)arg1, (void*)arg2);
+    sendSystemCallInternal(rpc, type, reinterpret_cast<void*>(arg1),
+                           reinterpret_cast<void*>(arg2));
   }
   template<class T1, class T2, class T3> static
   void sendSystemCall(const SyscallRequestInfo& rpc, LockType type,
                       T1 arg1, T2 arg2, T3 arg3) {
-    sendSystemCallInternal(rpc, type, (void*)arg1, (void*)arg2, (void*)arg3);
+    sendSystemCallInternal(rpc, type, reinterpret_cast<void*>(arg1),
+                           reinterpret_cast<void*>(arg2),
+                           reinterpret_cast<void*>(arg3));
   }
   template<class T1, class T2, class T3, class T4> static
   void sendSystemCall(const SyscallRequestInfo& rpc, LockType type,
                       T1 arg1, T2 arg2, T3 arg3, T4 arg4) {
-    sendSystemCallInternal(rpc, type, (void*)arg1, (void*)arg2, (void*)arg3,
-                           (void*)arg4);
+    sendSystemCallInternal(rpc, type, reinterpret_cast<void*>(arg1),
+                           reinterpret_cast<void*>(arg2),
+                           reinterpret_cast<void*>(arg3),
+                           reinterpret_cast<void*>(arg4));
   }
   template<class T1, class T2, class T3, class T4, class T5> static
   void sendSystemCall(const SyscallRequestInfo& rpc, LockType type,
                       T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5) {
-    sendSystemCallInternal(rpc, type, (void*)arg1, (void*)arg2, (void*)arg3,
-                           (void*)arg4, (void*)arg5);
+    sendSystemCallInternal(rpc, type, reinterpret_cast<void*>(arg1),
+                           reinterpret_cast<void*>(arg2),
+                           reinterpret_cast<void*>(arg3),
+                           reinterpret_cast<void*>(arg4),
+                           reinterpret_cast<void*>(arg5));
   }
   template<class T1, class T2, class T3, class T4, class T5, class T6> static
   void sendSystemCall(const SyscallRequestInfo& rpc, LockType type,
                       T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6,
                       Args* newSecureMem = 0) {
-    sendSystemCallInternal(rpc, type, (void*)arg1, (void*)arg2, (void*)arg3,
-                           (void*)arg4, (void*)arg5, (void*)arg6,
-                           newSecureMem);
+    sendSystemCallInternal(rpc, type, reinterpret_cast<void*>(arg1),
+                           reinterpret_cast<void*>(arg2),
+                           reinterpret_cast<void*>(arg3),
+                           reinterpret_cast<void*>(arg4),
+                           reinterpret_cast<void*>(arg5),
+                           reinterpret_cast<void*>(arg6), newSecureMem);
   }
 
  private:
   // Allows the trusted process to check whether the parent process still
   // exists. If it doesn't, kill the trusted process.
   static void dieIfParentDied(int parentMapsFd);
 
   static void sendSystemCallInternal(const SyscallRequestInfo& rpc,
                                      LockType type,
                                      void* arg1 = 0, void* arg2 = 0,
                                      void* arg3 = 0, void* arg4 = 0,
                                      void* arg5 = 0, void* arg6 = 0,
                                      Args* newSecureMem = 0);
 };
 
 } // namespace
 
 #endif // SECURE_MEM_H__