foo

9 files changed, 74 insertions, 45 deletions

diff --git a/ChangeLog-97a b/ChangeLog-97a
index 9ef0763f851..1d82c0d27a1 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,3 +1,31 @@
+Mon Feb 17 18:32:29 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+
+	* ace/OS.h: Protected the #ifdef for CLOCK_REALTIME so that it
+ 	  won't conflict with an existing macro in AIX.  Thanks to Chris
+ 	  Lahey <CLahey@cccis.com> for this.
+
+	* ace/Local_Name_Space_T.h: Added Local_Name_Space.h to
+ 	  Local_Name_Space_T.h so that templates will work correctly on
+ 	  AIX.  Thanks to Chris Lahey <CLahey@cccis.com> for this.
+
+	* tests: Added a new test, Reactor_Notify_Test.cpp, which tests
+ 	  out the new max_notify_iterations() method on the Reactor.
+
+	* ace/Reactor: Finished rewriting and testing the new dispatching
+ 	  logic of the Reactor.  The new implementation guards against
+ 	  pathological cases where ACE_Event_Handler::handle_*() methods
+ 	  remove registered ACE_Event_Handler objects whose handles are
+ 	  pending in the dispatch_set.  Previously there was no good way
+ 	  to guard against this.  Now, it should be handled automatically.
+
+	* ace: Added many minor fixes to remove warnings with the SGI C++
+ 	  compiler.  Thanks to Gonzalo Diethelm <gonzo@ing.puc.cl> for
+ 	  suggesting this.
+
+	* include/makeinclude/platform_irix6.2_sgic++.GNU: Turned on all
+ 	  the warnings for the SGI C++ compiler.  Thanks to Gonzalo
+ 	  Diethelm <gonzo@ing.puc.cl> for suggesting this.
+
 Mon Feb 17 20:59:47 1997  David L. Levine  <levine@cs.wustl.edu>
 
 	* ace/IOStream.h: added null ipfx (), etc., methods for ACE_WIN32
@@ -22,26 +50,6 @@ Mon Feb 17 20:59:47 1997  David L. Levine  <levine@cs.wustl.edu>
 	  remote_dgram_client_test.cpp (main): cast mmap.size () to
 	  ssize_t to avoid signed/unsigned comparison.
 
-Mon Feb 17 18:32:29 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* ace/OS.h: Protected the #ifdef for CLOCK_REALTIME so that it
- 	  won't conflict with an existing macro in AIX.  Thanks to Chris
- 	  Lahey <CLahey@cccis.com> for this.
-
-	* ace/Local_Name_Space_T.h: Added Local_Name_Space.h to
- 	  Local_Name_Space_T.h so that templates will work correctly on
- 	  AIX.  Thanks to Chris Lahey <CLahey@cccis.com> for this.
-
-	* tests: Added a new test, Reactor_Notify_Test.cpp, which tests
- 	  out the new max_notify_iterations() method on the Reactor.
-
-	* ace/Reactor: Finished rewriting and testing the new dispatching
- 	  logic of the Reactor.  The new implementation guards against
- 	  pathological cases where ACE_Event_Handler::handle_*() methods
- 	  remove registered ACE_Event_Handler objects whose handles are
- 	  pending in the dispatch_set.  Previously there was no good way
- 	  to guard against this.  Now, it should be handled automatically.
-
 Mon Feb 17 09:25:08 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
 	* ace/config-linux-lxpthreads.h: Bumped the Linux kernel version
diff --git a/Makefile b/Makefile
index a3e9a57b1d0..8871f582e30 100644
--- a/Makefile
+++ b/Makefile
@@ -92,16 +92,16 @@ endif
 ifeq ($(PWD),/home/cs/faculty/schmidt/adaptive/ACE_wrappers)
   TIMESTAMP = perl -pi -e 'BEGIN {chop ($$date=`/usr/bin/date`);} \
                            s/(, released ).*/$$1$$date./' VERSION; \
+              cvs commit -m'make release: updated timestamp' VERSION; \
 	      chmod 644 VERSION; \
-              cvs commit -m'make release: updated timestamp' VERSION; 
 else
   TIMESTAMP =
 endif
 
 cleanrelease:
-	($(TIMESTAMP)make realclean; cd ..; /bin/rm -f ACE.tar.gz; tar cvf ACE.tar $(RELEASE_FILES); gzip -9 ACE.tar; chmod a+r ACE.tar.gz)
+	($(TIMESTAMP)make realclean; cd ..; /bin/rm -f ACE.tar.gz; tar cvf ACE.tar $(RELEASE_FILES); gzip -9 ACE.tar; chmod a+r ACE.tar.gz; mv ACE.tar.gz ./ACE_wrappers/)
 
 release:
-	($(TIMESTAMP)cd ..; /bin/rm -f ACE.tar.gz; tar cvf ACE.tar $(RELEASE_FILES); gzip -9 ACE.tar; chmod a+r ACE.tar.gz)
-	(cd ..; /bin/rm -f ACE-lib.tar.gz; tar cvf ACE-lib.tar $(RELEASE_LIB_FILES); gzip -9 ACE-lib.tar; chmod a+r ACE-lib.tar.gz)
+	($(TIMESTAMP)cd ..; /bin/rm -f ACE.tar.gz; tar cvf ACE.tar $(RELEASE_FILES); gzip -9 ACE.tar; chmod a+r ACE.tar.gz; mv ACE.tar.gz ./ACE_wrappers/)
+	(cd ..; /bin/rm -f ACE-lib.tar.gz; tar cvf ACE-lib.tar $(RELEASE_LIB_FILES); gzip -9 ACE-lib.tar; chmod a+r ACE-lib.tar.gz; mv ACE-lib.tar.gz ./ACE_wrappers/)
 
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 79b6ccbba59..e329a233e72 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -370,7 +370,7 @@ ACE::send_n (ACE_HANDLE handle, const void *buf, size_t len)
 {
   ACE_TRACE ("ACE::send_n");
   size_t bytes_written;
-  ssize_t n;
+  ssize_t n = 0;
 
   for (bytes_written = 0; bytes_written < len; bytes_written += n)
     {
@@ -396,7 +396,7 @@ ACE::send_n (ACE_HANDLE handle,
 {
   ACE_TRACE ("ACE::send_n");
   size_t bytes_written;
-  ssize_t n;
+  ssize_t n = 0;
 
   for (bytes_written = 0; bytes_written < len; bytes_written += n)
     {
@@ -426,7 +426,7 @@ ACE::write_n (ACE_HANDLE handle,
   ACE_TRACE ("ACE::write_n");
 
   size_t bytes_written;
-  ssize_t n;
+  ssize_t n = 0;
 
   for (bytes_written = 0; bytes_written < len; bytes_written += n)
     {
@@ -449,7 +449,7 @@ ACE::recv_n (ACE_HANDLE handle, void *buf, size_t len)
 {
   ACE_TRACE ("ACE::recv_n");
   size_t bytes_read;
-  ssize_t n;
+  ssize_t n = 0;
 
   for (bytes_read = 0; bytes_read < len; bytes_read += n)
     {
@@ -473,7 +473,7 @@ ACE::recv_n (ACE_HANDLE handle, void *buf, size_t len, int flags)
 {
   ACE_TRACE ("ACE::recv_n");
   size_t bytes_read;
-  ssize_t n;
+  ssize_t n = 0;
 
   for (bytes_read = 0; bytes_read < len; bytes_read += n)
     {
@@ -504,7 +504,7 @@ ACE::read_n (ACE_HANDLE handle,
   ACE_TRACE ("ACE::read_n");
 
   size_t bytes_read;
-  ssize_t n;
+  ssize_t n = 0;
 
   for (bytes_read = 0; bytes_read < len; bytes_read += n)
     {
diff --git a/ace/OS.h b/ace/OS.h
index a4f400bbbcf..db1c2da87ef 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -2466,8 +2466,8 @@ public:
   static long filesize (ACE_HANDLE handle);
   static int getmsg (ACE_HANDLE handle, struct strbuf *ctl, struct strbuf
                      *data, int *flags); 
-  static getpmsg (ACE_HANDLE handle, struct strbuf *ctl, struct strbuf
-                  *data, int *band, int *flags); 
+  static int getpmsg (ACE_HANDLE handle, struct strbuf *ctl, struct strbuf
+		      *data, int *band, int *flags); 
   static int ioctl (ACE_HANDLE handle, int cmd, void * = 0);
   static int isastream (ACE_HANDLE handle);
   static int isatty (ACE_HANDLE handle);
@@ -2475,8 +2475,8 @@ public:
   static ACE_HANDLE open (const char *filename, int mode, int perms = 0);
   static int putmsg (ACE_HANDLE handle, const struct strbuf *ctl, const
                      struct strbuf *data, int flags); 
-  static putpmsg (ACE_HANDLE handle, const struct strbuf *ctl, const
-                  struct strbuf *data, int band, int flags); 
+  static int putpmsg (ACE_HANDLE handle, const struct strbuf *ctl, const
+		      struct strbuf *data, int band, int flags); 
   static ssize_t read (ACE_HANDLE handle, void *buf, size_t len); 
   static ssize_t read (ACE_HANDLE handle, void *buf, size_t len, ACE_OVERLAPPED *); 
   static ssize_t readv (ACE_HANDLE handle, struct iovec *iov, int iovlen); 
diff --git a/ace/OS.i b/ace/OS.i
index b713ec01d4e..3c3911292bc 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -2606,6 +2606,7 @@ ACE_OS::getprotobyname_r (const char *name,
     return 0;
 #else
 #if defined(ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
+  ACE_UNUSED_ARG (result);
   ACE_NETDBCALL_RETURN (::getprotobyname (name),
 			struct protoent *, 0,
 			buffer, sizeof (ACE_PROTOENT_DATA));
@@ -2652,6 +2653,7 @@ ACE_OS::getprotobynumber_r (int proto,
     return 0;
 #else
 #if defined(ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
+  ACE_UNUSED_ARG (result);
   ACE_NETDBCALL_RETURN (::getprotobynumber (proto),
 			struct protoent *, 0,
 			buffer, sizeof (ACE_PROTOENT_DATA));
@@ -2874,6 +2876,8 @@ ACE_OS::gethostbyaddr_r (const char *addr, int length, int type,
     }
 #else
 #if defined(ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
+  ACE_UNUSED_ARG (result);
+  ACE_UNUSED_ARG (h_errnop);
   ACE_NETDBCALL_RETURN (::gethostbyaddr (addr, (ACE_SOCKET_LEN) length, type),
 			struct hostent *, 0,
 			buffer, sizeof (ACE_HOSTENT_DATA));
@@ -2921,6 +2925,8 @@ ACE_OS::gethostbyname_r (const char *name, hostent *result,
     }
 #else
 #if defined(ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
+  ACE_UNUSED_ARG (result);
+  ACE_UNUSED_ARG (h_errnop);
   ACE_NETDBCALL_RETURN (::gethostbyname (name),
 			struct hostent *, 0,
 			buffer, sizeof (ACE_HOSTENT_DATA));
@@ -2965,6 +2971,7 @@ ACE_OS::getservbyname_r (const char *svc, const char *proto,
     return (struct servent *) 0;
 #else
 #if defined(ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
+  ACE_UNUSED_ARG (result);
   ACE_NETDBCALL_RETURN (::getservbyname (svc, proto),
 			struct servent *, 0,
 			buf, sizeof (ACE_SERVENT_DATA));
@@ -3372,6 +3379,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread)
 #if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_continue (target_thread), ace_result_), int, -1);
 #elif defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS)
+  ACE_UNUSED_ARG (target_thread);
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_HAS_WTHREADS)
   return ::ResumeThread (target_thread) != ACE_SYSCALL_FAILED ? 0 : -1;
@@ -3507,6 +3515,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id,
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (waiter_id, thr_id, status), ace_result_), 
 		     int, -1);
 #elif defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS)
+  ACE_UNUSED_ARG (thr_id);
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_join (waiter_id, status), ace_result_), 
 		     int, -1);
 #elif defined (ACE_HAS_WTHREADS)
@@ -3587,6 +3596,8 @@ ACE_OS::thr_setcancelstate (int new_state, int *old_state)
   // I didn't manage to find pthread_cancel anywhere in the MIT pthread
   // implementation. So I'll just leave this instead, and see what
   // breaks. -- jwr
+  ACE_UNUSED_ARG (old_state);
+  ACE_UNUSED_ARG (new_state);
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_HAS_STHREADS)
   ACE_NOTSUP_RETURN (-1);
@@ -3622,6 +3633,8 @@ ACE_OS::thr_setcanceltype (int new_type, int *old_type)
   // I didn't manage to find pthread_cancel anywhere int the MIT pthread
   // implementation. So I'll just leave this instead, and see what
   // breaks. -- jwr
+  ACE_UNUSED_ARG (new_type);
+  ACE_UNUSED_ARG (old_type);
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_HAS_STHREADS)
   ACE_NOTSUP_RETURN (-1);
@@ -3651,6 +3664,7 @@ ACE_OS::thr_cancel (ACE_thread_t thr_id)
   // I didn't manage to find pthread_cancel anywhere int the MIT
   // pthread implementation. So I'll just leave this instead, and
   // see what breaks. -- jwr
+  ACE_UNUSED_ARG (t_id);
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_HAS_STHREADS)
   ACE_NOTSUP_RETURN (-1);
@@ -3914,9 +3928,10 @@ ACE_OS::thr_setconcurrency (int hint)
 				       ace_result_), 
 		     int, -1);
 #elif defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS)
+  ACE_UNUSED_ARG (hint);
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_HAS_WTHREADS)
-  ACE_UNUSED_ARG(hint);
+  ACE_UNUSED_ARG (hint);
 	
   ACE_NOTSUP_RETURN (-1);
 #elif defined (VXWORKS)
@@ -3972,6 +3987,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread)
 #if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_suspend (target_thread), ace_result_), int, -1);
 #elif defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS)
+  ACE_UNUSED_ARG (target_thread);
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_HAS_WTHREADS)
   if (::SuspendThread (target_thread) != ACE_SYSCALL_FAILED)
diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp
index e89fdcdab6b..af5adf48a3d 100644
--- a/ace/SPIPE_Acceptor.cpp
+++ b/ace/SPIPE_Acceptor.cpp
@@ -84,8 +84,8 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
 					 FILE_FLAG_OVERLAPPED,
 					 PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE,
 					 MAX_PIPE_INSTANCES,
-					 1024*10,
-					 1024*10,
+					 1024 * 10,
+					 1024 * 10,
 					 ACE_DEFAULT_TIMEOUT,
 					 NULL);
   if (handle == ACE_INVALID_HANDLE)
@@ -94,6 +94,7 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
     this->set_handle (handle);
   return 0;
 #else
+  ACE_UNUSED_ARG (perms);
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_STREAM_PIPES */
 }
@@ -158,9 +159,9 @@ ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io,
 
   return 0;
 #elif defined (ACE_WIN32)
-	ACE_UNUSED_ARG(restart);
-	ACE_UNUSED_ARG(timeout);
-	ACE_UNUSED_ARG(remote_addr);
+  ACE_UNUSED_ARG (restart);
+  ACE_UNUSED_ARG (timeout);
+  ACE_UNUSED_ARG (remote_addr);
 
   // Check to see if we have a valid pipe
   if (this->get_handle () == ACE_INVALID_HANDLE)
@@ -210,6 +211,10 @@ ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io,
   // Create a new instance of the pipe for the next connection.
   return this->create_new_instance ();
 #else
+  ACE_UNUSED_ARG (restart);
+  ACE_UNUSED_ARG (timeout);
+  ACE_UNUSED_ARG (remote_addr);
+  ACE_UNUSED_ARG (new_io);
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_STREAM_PIPES */
 }
diff --git a/ace/UPIPE_Stream.cpp b/ace/UPIPE_Stream.cpp
index b68183f06f2..7aa4c3228d9 100644
--- a/ace/UPIPE_Stream.cpp
+++ b/ace/UPIPE_Stream.cpp
@@ -171,7 +171,7 @@ ACE_UPIPE_Stream::send_n (const char *buf,
   ACE_TRACE ("ACE_UPIPE_Stream::send_n");
 
   size_t bytes_written;
-  ssize_t len;
+  ssize_t len = 0;
 
   for (bytes_written = 0; 
        bytes_written < n;
@@ -195,7 +195,7 @@ ACE_UPIPE_Stream::recv_n (char *buf,
 {
   ACE_TRACE ("ACE_UPIPE_Stream::recv_n");
   size_t bytes_read;
-  ssize_t len;
+  ssize_t len = 0;
 
   for (bytes_read = 0; 
        bytes_read < n;
diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp
index 0ff8636e048..5f783afcc19 100644
--- a/ace/XtReactor.cpp
+++ b/ace/XtReactor.cpp
@@ -107,7 +107,7 @@ ACE_XtReactor::TimerCallbackProc (XtPointer closure, XtIntervalId *id)
 
 void ACE_XtReactor::InputCallbackProc (XtPointer closure, 
 				       int * source, 
-				       XtInputId *id)
+				       XtInputId *)
 {
   ACE_XtReactor *self = (ACE_XtReactor *) closure;
 
@@ -150,7 +150,7 @@ void ACE_XtReactor::InputCallbackProc (XtPointer closure,
 
 int ACE_XtReactor::XtWaitForMultipleEvents (int width, 
 					    ACE_Reactor_Handle_Set &wait_set,
-					    ACE_Time_Value *max_wait_time)
+					    ACE_Time_Value *)
 {
   // Check to make sure our handle's are all usable.
 
diff --git a/include/makeinclude/platform_irix6.2_sgic++.GNU b/include/makeinclude/platform_irix6.2_sgic++.GNU
index ba42f9a5975..115f9e6e57d 100644
--- a/include/makeinclude/platform_irix6.2_sgic++.GNU
+++ b/include/makeinclude/platform_irix6.2_sgic++.GNU
@@ -17,7 +17,7 @@ CPPFLAGS	+= -ptused -prelink -D_SGI_MP_SOURCE
 # For the new 32 bit C++ compiler (-n32)
 #CPPFLAGS	+= -n32 -woff 1174,1209,1375,1506,1110,1552,1021,1171
 # For the old C++ compiler (-32)
-CPPFLAGS	+= +pp -woff 3203,3209,3161,3262,3665
+CPPFLAGS	+= +pp
 LDFLAGS		+= -rpath "$(WRAPPER_ROOT)/ace" -Wl,-woff,85
 LIBS		+= -lpthread
 PIC		= -KPIC