*** empty log message ***

4 files changed, 46 insertions, 18 deletions

diff --git a/ChangeLog-98a b/ChangeLog-98a
index ca33456374e..545ae5f5af6 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,3 +1,18 @@
+Wed Jan  7 16:28:16 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+
+	* ace/Event_Handler_T.cpp: Reordered the initializers in the
+ 	  ACE_Event_Handler_T constructor so G++ doesn't complain.  Thanks
+ 	  to Oleg Krivosheev <kriol@fnal.gov> for reporting this.
+
+	* ace/Shared_Memory.h: Added a virtual destructor to the
+ 	  ACE_Shared_Memory abstract base class so that EGCS won't
+ 	  complain.  Thanks to Oleg Krivosheev <kriol@fnal.gov> for
+ 	  reporting this.
+
+	* ace/Event_Handler_T.h: Had to include the *.cpp file into .h
+ 	  when ACE_TEMPLATES_REQUIRE_SOURCE is defined.  Thanks to Oleg
+ 	  Krivosheev <kriol@fnal.gov> for reporting this.
+
 Wed Jan 07 14:31:34 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * ACE version 4.4.16, released Wed Jan 07 14:31:34 1998.
diff --git a/ace/Event_Handler_T.cpp b/ace/Event_Handler_T.cpp
index dcc36466413..010f9c88e80 100644
--- a/ace/Event_Handler_T.cpp
+++ b/ace/Event_Handler_T.cpp
@@ -1,6 +1,9 @@
 // Event_Handler_T.cpp
 // $Id$
 
+#if !defined (EVENT_HANDLER_T_C)
+#define EVENT_HANDLER_T_C
+
 #define ACE_BUILD_DLL
 #include "ace/Event_Handler_T.h"
 
@@ -37,18 +40,19 @@ ACE_Event_Handler_T<T>::ACE_Event_Handler_T (T *op_handler, int delete_handler,
 					     SET_HANDLE set_handle,
 					     IO_HANDLER except_h)
   : op_handler_ (op_handler),
-    delete_handler_ (delete_handler),
-    get_handle_ (get_handle),
     input_handler_ (input_h),
+    output_handler_ (output_h),
+    except_handler_ (except_h),
+    to_handler_ (timeout_h),
     cl_handler_ (close_h),
     sig_handler_ (sig_h),
-    to_handler_ (timeout_h),
-    output_handler_ (output_h),
+    delete_handler_ (delete_handler),
     set_handle_ (set_handle),
-    except_handler_ (except_h)
+    get_handle_ (get_handle)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::ACE_Event_Handler_T");
 }
 
 #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
 
+#endif /* EVENT_HANDLER_T_C */
diff --git a/ace/Event_Handler_T.h b/ace/Event_Handler_T.h
index 2f71ebcfea3..f6b29e546f3 100644
--- a/ace/Event_Handler_T.h
+++ b/ace/Event_Handler_T.h
@@ -84,22 +84,23 @@ public:
   // = Initialization and termination methods.
 
   ACE_Event_Handler_T (T *op_handler, 
-                   int delete_handler,
-                   GET_HANDLE get_handle = 0,
-                   IO_HANDLER input = 0,
-                   CL_HANDLER close = 0,
-                   SIG_HANDLER sig = 0,
-                   TO_HANDLER timeout = 0,
-                   IO_HANDLER output = 0,
-                   SET_HANDLE set_handle = 0,
-                   IO_HANDLER except = 0);
+                       int delete_handler,
+                       GET_HANDLE get_handle = 0,
+                       IO_HANDLER input = 0,
+                       CL_HANDLER close = 0,
+                       SIG_HANDLER sig = 0,
+                       TO_HANDLER timeout = 0,
+                       IO_HANDLER output = 0,
+                       SET_HANDLE set_handle = 0,
+                       IO_HANDLER except = 0);
   // Initialize the op_handler.
 
   ~ACE_Event_Handler_T (void);
   // Close down and delete the <op_handler>
 
-  // = Override all the ACE_Event_Handler methods and have them call
-  // through to the <T> operations handler.
+  // = Override all the ACE_Event_Handler methods.
+
+  // These methods all delegate down to the <T> operations handler.
   virtual ACE_HANDLE get_handle (void) const;
   virtual void set_handle (ACE_HANDLE);
   virtual int handle_input (ACE_HANDLE fd = -1);
@@ -113,8 +114,7 @@ public:
   T *op_handler (void);
   void op_handler (T *);
 
-  // = Get/set the target pointer-to-member-function used for
-  // dispatching.
+  // = Get/set the target pointer-to-method used for dispatching.
   
   GET_HANDLE handle_get (void);
   void handle_get (GET_HANDLE);
@@ -177,5 +177,13 @@ protected:
 #include "ace/Event_Handler_T.i"
 #endif /* __ACE_INLINE__ */
 
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ace/Event_Handler_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Event_Handler_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
 #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
 #endif /* ACE_EVENT_HANDLER_H */
diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h
index 43c9248fc0f..acf8898b4a4 100644
--- a/ace/Shared_Memory.h
+++ b/ace/Shared_Memory.h
@@ -33,6 +33,7 @@ class ACE_Export ACE_Shared_Memory
   //     out the <ACE_Malloc> class.
 public:
   // = Note that all methods are pure virtual.
+  ~ACE_Shared_Memory (void) { /* no-op. */ }
   virtual int close (void) = 0;
   virtual int remove (void) = 0;
   virtual void *malloc (size_t = 0) = 0;