| Index: base/win/scoped_variant.h
|
| diff --git a/base/win/scoped_variant.h b/base/win/scoped_variant.h
|
| index 322fcf71e5574725ed6d887be4e5c49605bdc6b1..16d43f99b6c0b2cc12ec432f4d9d180a52cd0ab4 100644
|
| --- a/base/win/scoped_variant.h
|
| +++ b/base/win/scoped_variant.h
|
| @@ -7,9 +7,10 @@
|
|
|
| #include <windows.h>
|
| #include <oleauto.h>
|
| +#include <stdint.h>
|
|
|
| #include "base/base_export.h"
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
|
|
| namespace base {
|
| namespace win {
|
| @@ -90,14 +91,14 @@ class BASE_EXPORT ScopedVariant {
|
| void Set(const wchar_t* str);
|
|
|
| // Setters for simple types.
|
| - void Set(int8 i8);
|
| - void Set(uint8 ui8);
|
| - void Set(int16 i16);
|
| - void Set(uint16 ui16);
|
| - void Set(int32 i32);
|
| - void Set(uint32 ui32);
|
| - void Set(int64 i64);
|
| - void Set(uint64 ui64);
|
| + void Set(int8_t i8);
|
| + void Set(uint8_t ui8);
|
| + void Set(int16_t i16);
|
| + void Set(uint16_t ui16);
|
| + void Set(int32_t i32);
|
| + void Set(uint32_t ui32);
|
| + void Set(int64_t i64);
|
| + void Set(uint64_t ui64);
|
| void Set(float r32);
|
| void Set(double r64);
|
| void Set(bool b);
|
|
|