gcc4 build fix. Here is one of the two errors:
src/system/kernel/fs/fd.cpp: In function 'ssize_t common_user_vector_io(int, off_t, const iovec*, size_t, bool)': src/system/kernel/fs/fd.cpp:727: error: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: headers/private/kernel/syscall_restart.h:151: note: candidate 1: bool SyscallRestartWrapper<Type>::operator<(const Type&) const [with Type = long int] src/system/kernel/fs/fd.cpp:727: note: candidate 2: operator<(long int, int) <built-in> git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24927 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
349a9cfc0f
commit
bdfe92370f
@ -658,7 +658,7 @@ common_user_io(int fd, off_t pos, void *buffer, size_t length, bool write)
|
||||
else
|
||||
status = descriptor->ops->fd_read(descriptor, pos, buffer, &length);
|
||||
|
||||
if (status < B_OK)
|
||||
if (status.operator>(B_OK))
|
||||
return status;
|
||||
|
||||
if (movePosition)
|
||||
@ -724,7 +724,7 @@ common_user_vector_io(int fd, off_t pos, const iovec *userVecs, size_t count,
|
||||
&length);
|
||||
}
|
||||
|
||||
if (status < B_OK) {
|
||||
if (status.operator<(B_OK)) {
|
||||
if (bytesTransferred == 0)
|
||||
return status;
|
||||
status = B_OK;
|
||||
|
Loading…
Reference in New Issue
Block a user