Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(705)

Unified Diff: base/files/file_win.cc

Issue 1549853002: Switch to standard integer types in base/files/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/files/file_util_win.cc ('k') | base/files/important_file_writer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/files/file_win.cc
diff --git a/base/files/file_win.cc b/base/files/file_win.cc
index c2cc3abb8621ecfa6c369c190ec4806f10a9ab04..8329672b9880e486c6cb2a6792f516eea5e26048 100644
--- a/base/files/file_win.cc
+++ b/base/files/file_win.cc
@@ -5,6 +5,7 @@
#include "base/files/file.h"
#include <io.h>
+#include <stdint.h>
#include "base/logging.h"
#include "base/metrics/sparse_histogram.h"
@@ -39,7 +40,7 @@ void File::Close() {
file_.Close();
}
-int64 File::Seek(Whence whence, int64 offset) {
+int64_t File::Seek(Whence whence, int64_t offset) {
ThreadRestrictions::AssertIOAllowed();
DCHECK(IsValid());
@@ -53,7 +54,7 @@ int64 File::Seek(Whence whence, int64 offset) {
return res.QuadPart;
}
-int File::Read(int64 offset, char* data, int size) {
+int File::Read(int64_t offset, char* data, int size) {
ThreadRestrictions::AssertIOAllowed();
DCHECK(IsValid());
DCHECK(!async_);
@@ -96,7 +97,7 @@ int File::ReadAtCurrentPos(char* data, int size) {
return -1;
}
-int File::ReadNoBestEffort(int64 offset, char* data, int size) {
+int File::ReadNoBestEffort(int64_t offset, char* data, int size) {
// TODO(dbeam): trace this separately?
return Read(offset, data, size);
}
@@ -106,7 +107,7 @@ int File::ReadAtCurrentPosNoBestEffort(char* data, int size) {
return ReadAtCurrentPos(data, size);
}
-int File::Write(int64 offset, const char* data, int size) {
+int File::Write(int64_t offset, const char* data, int size) {
ThreadRestrictions::AssertIOAllowed();
DCHECK(IsValid());
DCHECK(!async_);
@@ -147,7 +148,7 @@ int File::WriteAtCurrentPosNoBestEffort(const char* data, int size) {
return WriteAtCurrentPos(data, size);
}
-int64 File::GetLength() {
+int64_t File::GetLength() {
ThreadRestrictions::AssertIOAllowed();
DCHECK(IsValid());
@@ -157,10 +158,10 @@ int64 File::GetLength() {
if (!::GetFileSizeEx(file_.Get(), &size))
return -1;
- return static_cast<int64>(size.QuadPart);
+ return static_cast<int64_t>(size.QuadPart);
}
-bool File::SetLength(int64 length) {
+bool File::SetLength(int64_t length) {
ThreadRestrictions::AssertIOAllowed();
DCHECK(IsValid());
@@ -309,7 +310,7 @@ File::Error File::OSErrorToFileError(DWORD last_error) {
}
}
-void File::DoInitialize(const FilePath& path, uint32 flags) {
+void File::DoInitialize(const FilePath& path, uint32_t flags) {
ThreadRestrictions::AssertIOAllowed();
DCHECK(!IsValid());
« no previous file with comments | « base/files/file_util_win.cc ('k') | base/files/important_file_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698