| Index: chromeos/binder/writable_transaction_data.h
|
| diff --git a/chromeos/binder/writable_transaction_data.h b/chromeos/binder/writable_transaction_data.h
|
| index f32eff89f2ea192e11279f49fc3ee0a8505da85f..9001ad340d521c9b4cea3967ce8784c5351f68d5 100644
|
| --- a/chromeos/binder/writable_transaction_data.h
|
| +++ b/chromeos/binder/writable_transaction_data.h
|
| @@ -5,9 +5,11 @@
|
| #ifndef CHROMEOS_BINDER_WRITABLE_TRANSACTION_DATA_H_
|
| #define CHROMEOS_BINDER_WRITABLE_TRANSACTION_DATA_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/macros.h"
|
| #include "chromeos/binder/transaction_data.h"
|
| #include "chromeos/chromeos_export.h"
|
| @@ -24,7 +26,7 @@ class CHROMEOS_EXPORT WritableTransactionData : public TransactionData {
|
|
|
| // TransactionData override:
|
| uintptr_t GetCookie() const override;
|
| - uint32 GetCode() const override;
|
| + uint32_t GetCode() const override;
|
| pid_t GetSenderPID() const override;
|
| uid_t GetSenderEUID() const override;
|
| bool IsOneWay() const override;
|
| @@ -39,7 +41,7 @@ class CHROMEOS_EXPORT WritableTransactionData : public TransactionData {
|
| void Reserve(size_t n);
|
|
|
| // Sets the transaction code returned by GetCode().
|
| - void SetCode(uint32 code) { code_ = code; }
|
| + void SetCode(uint32_t code) { code_ = code; }
|
|
|
| // Sets the value returned by IsOneWay().
|
| void SetIsOneWay(bool is_one_way) { is_one_way_ = is_one_way; }
|
| @@ -47,17 +49,17 @@ class CHROMEOS_EXPORT WritableTransactionData : public TransactionData {
|
| // Appends the specified data with appropriate padding.
|
| void WriteData(const void* data, size_t n);
|
|
|
| - // Appends an int32 value.
|
| - void WriteInt32(int32 value);
|
| + // Appends an int32_t value.
|
| + void WriteInt32(int32_t value);
|
|
|
| - // Appends a uint32 value.
|
| - void WriteUint32(uint32 value);
|
| + // Appends a uint32_t value.
|
| + void WriteUint32(uint32_t value);
|
|
|
| - // Appends an int64 vlaue.
|
| - void WriteInt64(int64 value);
|
| + // Appends an int64_t vlaue.
|
| + void WriteInt64(int64_t value);
|
|
|
| - // Appends a uint64 value.
|
| - void WriteUint64(uint64 value);
|
| + // Appends a uint64_t value.
|
| + void WriteUint64(uint64_t value);
|
|
|
| // Appends a float value.
|
| void WriteFloat(float value);
|
| @@ -67,7 +69,7 @@ class CHROMEOS_EXPORT WritableTransactionData : public TransactionData {
|
| // TODO(hashimoto): Support more types (i.e. strings, FDs, objects).
|
|
|
| private:
|
| - uint32 code_ = 0;
|
| + uint32_t code_ = 0;
|
| bool is_one_way_ = false;
|
| std::vector<char> data_;
|
| std::vector<uintptr_t> object_offsets_;
|
|
|