From ac6a7455fde366e0619dac8a5bb04e09042d07dc Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Thu, 15 Jan 2015 11:24:28 -0800 Subject: [PATCH] win: use FileOffset, not off_t in string_file_writer_test off_t exists on Windows, but Seek is implemented in terms of SetFilePointerEx which expects a LONGLONG, so FileOffset is LONGLONG. So, use FileOffset in the test code so that it wraps at the expected value. R=mark@chromium.org BUG=crashpad:1 Review URL: https://codereview.chromium.org/854883002 --- util/file/string_file_writer_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/file/string_file_writer_test.cc b/util/file/string_file_writer_test.cc index 01b32369..1a34efc1 100644 --- a/util/file/string_file_writer_test.cc +++ b/util/file/string_file_writer_test.cc @@ -350,7 +350,7 @@ TEST(StringFileWriter, SeekInvalid) { EXPECT_EQ(1, writer.Seek(0, SEEK_CUR)); EXPECT_LT(writer.Seek(std::numeric_limits::min(), SEEK_SET), 0); EXPECT_EQ(1, writer.Seek(0, SEEK_CUR)); - EXPECT_LT(writer.Seek(std::numeric_limits::min(), SEEK_SET), 0); + EXPECT_LT(writer.Seek(std::numeric_limits::min(), SEEK_SET), 0); EXPECT_EQ(1, writer.Seek(0, SEEK_CUR)); EXPECT_TRUE(writer.string().empty()); @@ -362,8 +362,8 @@ TEST(StringFileWriter, SeekInvalid) { EXPECT_EQ(0, writer.Seek(0, SEEK_CUR)); EXPECT_TRUE(writer.string().empty()); - const off_t kMaxOffset = static_cast( - std::min(implicit_cast(std::numeric_limits::max()), + const FileOffset kMaxOffset = static_cast( + std::min(implicit_cast(std::numeric_limits::max()), implicit_cast(std::numeric_limits::max()))); EXPECT_EQ(kMaxOffset, writer.Seek(kMaxOffset, SEEK_SET));