*** empty log message ***

1 files changed, 11 insertions, 38 deletions

diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index b583931699f..213738cf943 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -1,36 +1,9 @@
 // $Id$
 
 #include "Notifier_Server.h"
-
+#include "notifier.h"
 ACE_RCSID(Notifier, notifier, "$Id$")
 
-class Notifier : public ACE_Event_Handler
-{
-  // = TITLE
-  //   Notifier driver for the TAO Publish/Subscribe example.
-  //
-  // = DESCRIPTION
-  //    The driver class for the <Event_Comm::Notifier> object.
-public:
-  // = Initialization and termination methods.
-  Notifier (int argc, char *argv[]);
-  // Constructor.
-
-  ~Notifier (void);
-  // Destructor.
-
-  void run (void);
-  // Execute the notifier.
-
-private:
-  virtual int handle_signal (int signum,
-			     siginfo_t *,
-			     ucontext_t *);
-  // Handle signals that shut us down.
-
-  Notifier_Server ns_;
-  // The notifier server.
-};
 
 int
 Notifier::handle_signal (int signum, siginfo_t *, ucontext_t *)
@@ -47,29 +20,29 @@ Notifier::handle_signal (int signum, siginfo_t *, ucontext_t *)
 void
 Notifier::run (void)
 {
-  TAO_TRY
+  ACE_TRY_NEW_ENV
     {
-      ns_.run (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      ns_.run (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
     }
-  TAO_CATCHANY
+  ACE_CATCHANY
     {
       return;
     }
-  TAO_ENDTRY;
+  ACE_ENDTRY;
 }
 
 Notifier::Notifier (int argc, char *argv[])
 {
-  TAO_TRY
+  ACE_TRY_NEW_ENV
     {
-      ns_.init (argc, argv, TAO_TRY_ENV);
+      ns_.init (argc, argv, ACE_TRY_ENV);
     }
-  TAO_CATCHANY
+  ACE_CATCHANY
     {
-      TAO_TRY_ENV.print_exception ("Notifier_Server.init failed\n ");
+      ACE_TRY_ENV.print_exception ("Notifier_Server.init failed\n ");
     }
-  TAO_ENDTRY;
+  ACE_ENDTRY;
 
   // Register with the ORB's Reactor to receive a signal to shut us
   // down.