summaryrefslogtreecommitdiffstats
path: root/native_client_sdk/src
diff options
context:
space:
mode:
authorsbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 02:12:36 +0000
committersbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 02:12:36 +0000
commitba682cb916f6cb5864e2cb49e6ba786aa48ebc8c (patch)
tree3689c6be96068286972e679e37ec0454c66fc90c /native_client_sdk/src
parent71dee8ea6cd3fd83b16c7bbb9b4a6ef151b3f3ab (diff)
downloadchromium_src-ba682cb916f6cb5864e2cb49e6ba786aa48ebc8c.zip
chromium_src-ba682cb916f6cb5864e2cb49e6ba786aa48ebc8c.tar.gz
chromium_src-ba682cb916f6cb5864e2cb49e6ba786aa48ebc8c.tar.bz2
[NaCl SDK] Fix build error (warning) in nacl_io_test.
The change that enabled -Wall should have contained this change. TBR=noelallen1 Review URL: https://codereview.chromium.org/19591005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src')
-rw-r--r--native_client_sdk/src/libraries/nacl_io_test/mount_node_mock.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/native_client_sdk/src/libraries/nacl_io_test/mount_node_mock.h b/native_client_sdk/src/libraries/nacl_io_test/mount_node_mock.h
index e160c6c..3354682 100644
--- a/native_client_sdk/src/libraries/nacl_io_test/mount_node_mock.h
+++ b/native_client_sdk/src/libraries/nacl_io_test/mount_node_mock.h
@@ -21,11 +21,11 @@ class MountNodeMock : public nacl_io::MountNode {
MOCK_METHOD0(Destroy, void());
MOCK_METHOD0(FSync, Error());
MOCK_METHOD1(FTruncate, Error(off_t));
- MOCK_METHOD4(GetDents, Error(size_t, struct dirent*, size_t, size_t*));
+ MOCK_METHOD4(GetDents, Error(size_t, struct dirent*, size_t, int*));
MOCK_METHOD1(GetStat, Error(struct stat*));
MOCK_METHOD2(Ioctl, Error(int, char*));
- MOCK_METHOD4(Read, Error(size_t, void*, size_t, size_t*));
- MOCK_METHOD4(Write, Error(size_t, const void*, size_t, size_t*));
+ MOCK_METHOD4(Read, Error(size_t, void*, size_t, int*));
+ MOCK_METHOD4(Write, Error(size_t, const void*, size_t, int*));
MOCK_METHOD6(MMap, Error(void*, size_t, int, int, size_t, void**));
MOCK_METHOD0(GetLinks, int());
MOCK_METHOD0(GetMode, int());