Switch to standard integer types in base/win/.

base/win/scoped_variant.h

 // Copyright (c) 2011 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 BASE_WIN_SCOPED_VARIANT_H_
 #define BASE_WIN_SCOPED_VARIANT_H_
 
 #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 {
 
 // Scoped VARIANT class for automatically freeing a COM VARIANT at the
 // end of a scope.  Additionally provides a few functions to make the
 // encapsulated VARIANT easier to use.
 // Instead of inheriting from VARIANT, we take the containment approach
 // in order to have more control over the usage of the variant and guard
 // against memory leaks.
@@ skipping 60 matching lines @@
 
   // Retrieves the pointer address.
   // Used to receive a VARIANT as an out argument (and take ownership).
   // The function DCHECKs on the current value being empty/null.
   // Usage: GetVariant(var.receive());
   VARIANT* Receive();
 
   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);
 
   // Creates a copy of |var| and assigns as this instance's value.
   // Note that this is different from the Reset() method that's used to
   // free the current value and assume ownership.
   void Set(const VARIANT& var);
 
   // COM object setters
@@ skipping 44 matching lines @@
   // Use the Compare method instead.
   bool operator==(const ScopedVariant& var) const;
   bool operator!=(const ScopedVariant& var) const;
   DISALLOW_COPY_AND_ASSIGN(ScopedVariant);
 };
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_WIN_SCOPED_VARIANT_H_