Index: ipc/ipc_message_utils.h |
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h |
index 9d70aff58bcb761aecc638d1c24a6229d7501c08..d0c1f721bcc39a63afae9fa08dcd67bb506dc420 100644 |
--- a/ipc/ipc_message_utils.h |
+++ b/ipc/ipc_message_utils.h |
@@ -5,6 +5,8 @@ |
#ifndef IPC_IPC_MESSAGE_UTILS_H_ |
#define IPC_IPC_MESSAGE_UTILS_H_ |
+#include <stdint.h> |
+ |
#include <algorithm> |
#include <map> |
#include <set> |
@@ -76,14 +78,14 @@ struct IPC_EXPORT LogData { |
~LogData(); |
std::string channel; |
- int32 routing_id; |
- uint32 type; // "User-defined" message type, from ipc_message.h. |
+ int32_t routing_id; |
+ uint32_t type; // "User-defined" message type, from ipc_message.h. |
std::string flags; |
- int64 sent; // Time that the message was sent (i.e. at Send()). |
- int64 receive; // Time before it was dispatched (i.e. before calling |
- // OnMessageReceived). |
- int64 dispatch; // Time after it was dispatched (i.e. after calling |
- // OnMessageReceived). |
+ int64_t sent; // Time that the message was sent (i.e. at Send()). |
+ int64_t receive; // Time before it was dispatched (i.e. before calling |
+ // OnMessageReceived). |
+ int64_t dispatch; // Time after it was dispatched (i.e. after calling |
+ // OnMessageReceived). |
std::string message_name; |
std::string params; |
}; |
@@ -208,12 +210,12 @@ template <> |
struct ParamTraits<long long> { |
typedef long long param_type; |
static void Write(Message* m, const param_type& p) { |
- m->WriteInt64(static_cast<int64>(p)); |
+ m->WriteInt64(static_cast<int64_t>(p)); |
} |
static bool Read(const Message* m, |
base::PickleIterator* iter, |
param_type* r) { |
- return iter->ReadInt64(reinterpret_cast<int64*>(r)); |
+ return iter->ReadInt64(reinterpret_cast<int64_t*>(r)); |
} |
IPC_EXPORT static void Log(const param_type& p, std::string* l); |
}; |
@@ -227,7 +229,7 @@ struct ParamTraits<unsigned long long> { |
static bool Read(const Message* m, |
base::PickleIterator* iter, |
param_type* r) { |
- return iter->ReadInt64(reinterpret_cast<int64*>(r)); |
+ return iter->ReadInt64(reinterpret_cast<int64_t*>(r)); |
} |
IPC_EXPORT static void Log(const param_type& p, std::string* l); |
}; |