$NetBSD$

--- ./rex/rex.C.orig	2002-11-19 19:58:44.000000000 +0000
+++ ./rex/rex.C
@@ -230,7 +230,7 @@ public:
   void
   newfd (svccb *sbp)
   {
-    rexcb_newfd_arg *arg = sbp->template getarg<rexcb_newfd_arg> ();
+    rexcb_newfd_arg *arg = sbp->getarg<rexcb_newfd_arg> ();
 
     masterfd = arg->newfd;
     vNew refcounted<ttyfd> (pch, masterfd, fd_in, fd_out);
@@ -358,7 +358,7 @@ public:
       return;
     }
     
-    rex_payload *argp = sbp->template getarg<rex_payload> ();
+    rex_payload *argp = sbp->getarg<rex_payload> ();
     size_t len = argp->data.size (); 
     
     if (len) {
@@ -514,7 +514,7 @@ class xsocklistenfd : public rexfd {
     }
     tcp_nodelay (fd);
     
-    rexcb_newfd_arg *parg = sbp->template getarg<rexcb_newfd_arg> ();
+    rexcb_newfd_arg *parg = sbp->getarg<rexcb_newfd_arg> ();
     vNew refcounted<xclientfd> (pch, parg->newfd, fd, x11_real_data,
 				x11_fake_data, x11_data_len,
 				implicit_cast<char *> (x11_proto));
@@ -583,7 +583,7 @@ public:
 
   void
   newfd (svccb *sbp) {
-    rexcb_newfd_arg *parg = sbp->template getarg<rexcb_newfd_arg> ();
+    rexcb_newfd_arg *parg = sbp->getarg<rexcb_newfd_arg> ();
       
     if (isunix) {
       int fd = unixsocket_connect (unixpath.cstr ());
@@ -658,7 +658,7 @@ public:
 
   void
   data (svccb *sbp) {
-    rex_payload *argp = sbp->template getarg<rex_payload> ();
+    rex_payload *argp = sbp->getarg<rex_payload> ();
 
     // length w/o newline
     size_t lenwonl = argp->data.size ();
