ChangeLogTag: Tue Aug 23 19:29:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 15 insertions, 16 deletions

diff --git a/apps/JAWS2/JAWS/IO_Handler.cpp b/apps/JAWS2/JAWS/IO_Handler.cpp
index 1a95493d0fc..595885c3686 100644
--- a/apps/JAWS2/JAWS/IO_Handler.cpp
+++ b/apps/JAWS2/JAWS/IO_Handler.cpp
@@ -243,7 +243,7 @@ JAWS_Asynch_IO_Handler_Factory::create_io_handler (void)
 {
   JAWS_TRACE ("JAWS_Asynch_IO_Handler_Factory::create");
 
-  JAWS_Asynch_IO_Handler *handler;
+  JAWS_Asynch_IO_Handler *handler = 0;
   handler = new JAWS_Asynch_IO_Handler (this);
 
   return handler;
diff --git a/apps/JAWS2/JAWS/IO_Handler.h b/apps/JAWS2/JAWS/IO_Handler.h
index f933ef60489..ab81bfd42e1 100644
--- a/apps/JAWS2/JAWS/IO_Handler.h
+++ b/apps/JAWS2/JAWS/IO_Handler.h
@@ -267,6 +267,19 @@ typedef ACE_Singleton<JAWS_Synch_IO_Handler_Factory, ACE_SYNCH_MUTEX>
 
 #if defined(ACE_WIN32) || defined(ACE_HAS_AIO_CALLS)
 
+class JAWS_Export JAWS_Asynch_IO_Handler_Factory : public JAWS_IO_Handler_Factory
+{
+public:
+  virtual ~JAWS_Asynch_IO_Handler_Factory (void);
+  // Destructor
+
+  virtual JAWS_IO_Handler *create_io_handler (void);
+  // This creates a new JAWS_IO_Handler
+
+  virtual void destroy_io_handler (JAWS_IO_Handler *handler);
+  // This deletes a JAWS_IO_Handler
+};
+
 class JAWS_Export JAWS_Asynch_IO_Handler : public JAWS_IO_Handler
 {
 friend class JAWS_Asynch_Handler;
@@ -275,7 +288,7 @@ friend class JAWS_Waiter;
 
   // Provide implementations for the common functions.
 public:
-  JAWS_Asynch_IO_Handler (JAWS_Asynch_IO_Handler_Factory *factory);
+  explicit JAWS_Asynch_IO_Handler (JAWS_Asynch_IO_Handler_Factory *factory);
   virtual ~JAWS_Asynch_IO_Handler (void);
 
   virtual ACE_Handler *handler (void);
@@ -290,20 +303,6 @@ protected:
   ACE_SYNCH_RW_MUTEX count_;
 };
 
-
-class JAWS_Export JAWS_Asynch_IO_Handler_Factory : public JAWS_IO_Handler_Factory
-{
-public:
-  virtual ~JAWS_Asynch_IO_Handler_Factory (void);
-  // Destructor
-
-  virtual JAWS_IO_Handler *create_io_handler (void);
-  // This creates a new JAWS_IO_Handler
-
-  virtual void destroy_io_handler (JAWS_IO_Handler *handler);
-  // This deletes a JAWS_IO_Handler
-};
-
 #else
 
 typedef JAWS_IO_Handler JAWS_Asynch_IO_Handler;