* java/net/natPlainSocketImpl.cc (_Jv_recv): Added template

	parameter for `recv' return type.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49345 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 044f724..1c192d7 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-30  Tom Tromey  <tromey@redhat.com>
 
+       * java/net/natPlainSocketImpl.cc (_Jv_recv): Added template
+       parameter for `recv' return type.
+
        * verify.cc (handle_ret_insn): Check for subroutine merge here...
        (state::merge): ... not here.
        (subr_entry_info): New structure.

diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index bbd700f..681144c 100644 (file)
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -71,9 +71,10 @@ _Jv_accept (int fd, struct sockaddr *addr, socklen_t *addrlen)
 #endif
 
 // A wrapper for recv so we don't have to do configure tests.
-template <typename T_fd, typename T_buf, typename T_len, typename T_flags>
+template <typename T_ret, typename T_fd, typename T_buf,
+          typename T_len, typename T_flags>
 static inline ssize_t
-_Jv_recv (ssize_t (*recv_func) (T_fd s, T_buf buf, T_len len, T_flags flags),
+_Jv_recv (T_ret (*recv_func) (T_fd s, T_buf buf, T_len len, T_flags flags),
          int s, void *buf, size_t len, int flags)
 {
   return recv_func ((T_fd) s, (T_buf) buf, (T_len) len, (T_flags) flags);