*** empty log message ***

5 files changed, 18 insertions, 7 deletions

diff --git a/ChangeLog-98b b/ChangeLog-98b
index f320a8e907a..b5f2f29149f 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,10 @@
+Thu Aug 20 17:05:28 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* examples/Service_Configurator/Misc/Timer_Service.cpp: Added some
+ 	  ACE_SVC_FACTORY_* macros for Timer_Service_1 so that it'll
+ 	  compile and link properly.  Thanks to David Levine for reporting
+ 	  this.
+
 Thu Aug 20 14:39:53 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ace/Process.{h,cpp} (ACE_Process::wait): Added a parameter of int* to
diff --git a/bin/README.html b/bin/README.html
index b281fbc680e..04bb92c0f35 100644
--- a/bin/README.html
+++ b/bin/README.html
@@ -14,9 +14,11 @@ bgcolor="#ffffff">
 This <A HREF="http://www.cs.wustl.edu/~schmidt/ACE-bin/">directory</A>
 contains versions of the freely available <A
 HREF="http://www.dscpl.com.au/">OSE</A> tools modified by Karlheinz
-Dorn (kdorn@erlh.siemens.de).  I (Doug Schmidt) am grateful to him for
-contributing his efforts to help improve ACE.  You can obtain these
-files via the <A HREF="ACE-obtain.html">ACE</A> release. <P>
+Dorn (kdorn@erlh.siemens.de).  I (<A
+HREF="http://www.cs.wustl.edu/~schmidt">Doug Schmidt</a>) am grateful
+to him for contributing his efforts to help improve ACE.  You can
+obtain these files via the <A HREF="ACE-obtain.html">ACE</A>
+release. <P>
 
 The primary goal of the modifications was to create a <EM>class</EM>.hxx and
 <EM>class</EM>.cxx file (for each class, struct, union included within the
diff --git a/etc/ACE-guidelines.html b/etc/ACE-guidelines.html
index 8475c98fc90..33f008b550e 100644
--- a/etc/ACE-guidelines.html
+++ b/etc/ACE-guidelines.html
@@ -101,7 +101,7 @@ to Graham for providing the OSE tools!<p>
         Certain subtle changes were also made in the ACE copies for
         indicating sections, <em>etc.</em>, which makes them different
         from the OSE documentation.  Please see the
-        <a href=http://www.cs.wustl.edu/~schmidt/ACE-doctools.html>ACE-doctools
+        <a href=http://www.cs.wustl.edu/~schmidt/ACE_wrappers/bin/README.html>ACE-doctools
         page</a> for descriptions of these changes.<p>
   </ul>
 
@@ -531,7 +531,7 @@ to Graham for providing the OSE tools!<p>
 
 <hr>
 <!-- hhmts start -->
-Last modified: Wed Aug 19 10:05:15 CDT 1998
+Last modified: Thu Aug 20 15:38:01 CDT 1998
 <!-- hhmts end -->
 
 </body>
diff --git a/examples/Service_Configurator/Misc/Timer_Service.cpp b/examples/Service_Configurator/Misc/Timer_Service.cpp
index dcbe9cdc5ac..0e5ea589b69 100644
--- a/examples/Service_Configurator/Misc/Timer_Service.cpp
+++ b/examples/Service_Configurator/Misc/Timer_Service.cpp
@@ -99,7 +99,8 @@ ACE_STATIC_SVC_DEFINE (Timer_Service_1,
 		       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
 
-// The following is a "Factory" used by the <ACE_Service_Config> and
+// The following are "Factories" used by the <ACE_Service_Config> and
 // svc.conf file to dynamically initialize the state of the Timer
-// Service.
+// Services.
+ACE_SVC_FACTORY_DEFINE (Timer_Service_1)
 ACE_SVC_FACTORY_DEFINE (Timer_Service_2)
diff --git a/examples/Service_Configurator/Misc/Timer_Service.h b/examples/Service_Configurator/Misc/Timer_Service.h
index 374caa59ec0..642bc3db019 100644
--- a/examples/Service_Configurator/Misc/Timer_Service.h
+++ b/examples/Service_Configurator/Misc/Timer_Service.h
@@ -39,5 +39,6 @@ class Timer_Service_2 : public Timer_Service_1
 
 // Declare both static and dynamic services.
 ACE_STATIC_SVC_DECLARE (Timer_Service_1)
+ACE_SVC_FACTORY_DECLARE (Timer_Service_1)
 ACE_SVC_FACTORY_DECLARE (Timer_Service_2)