ChangeLogTag: Tue Aug 26 08:37:21 2003 Venkita Subramonian <venkita@cs.wustl.edu>

7 files changed, 11 insertions, 27 deletions

diff --git a/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h b/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
index 31ca1c664ac..a676375338e 100644
--- a/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
+++ b/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
@@ -12,6 +12,7 @@
 #define DSRT_DIRECT_DISPATCHER_IMPL_T_H
 #include "ace/pre.h"
 #include "ace/Task.h"
+#include "ace/Copy_Disabled.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -94,7 +95,7 @@ namespace Kokyu
   class DSRT_Direct_Dispatcher_Impl :
     public ACE_Task_Base,
     public DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>,
-    public non_copyable
+    public ACE_Copy_Disabled
   {
   public:
     typedef typename
diff --git a/Kokyu/DSRT_Dispatch_Item_T.h b/Kokyu/DSRT_Dispatch_Item_T.h
index 727920ef187..6be8e6c96d7 100644
--- a/Kokyu/DSRT_Dispatch_Item_T.h
+++ b/Kokyu/DSRT_Dispatch_Item_T.h
@@ -12,6 +12,7 @@
 #define DSRT_DISPATCH_ITEM_H
 #include "ace/pre.h"
 #include "ace/Bound_Ptr.h"
+#include "ace/Copy_Disabled.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,7 +29,7 @@ namespace Kokyu
    */
 
   template <class DSRT_Scheduler_Traits>
-  class DSRT_Dispatch_Item : private non_copyable
+  class DSRT_Dispatch_Item : private ACE_Copy_Disabled
   {
     typedef typename
     DSRT_Scheduler_Traits::Guid_t Guid_t;
diff --git a/Kokyu/DSRT_Sched_Queue_T.h b/Kokyu/DSRT_Sched_Queue_T.h
index 599365f24e6..be2f72bd330 100644
--- a/Kokyu/DSRT_Sched_Queue_T.h
+++ b/Kokyu/DSRT_Sched_Queue_T.h
@@ -144,7 +144,7 @@ namespace Kokyu
     {
     public:
       /// Returns hash value.
-      u_long operator () (const Guid_t &id)
+      u_long operator () (const typename DSRT_Scheduler_Traits::Guid_t &id)
       {
         typename DSRT_Scheduler_Traits::Guid_Hash guid_hash;
         return guid_hash(id);
diff --git a/Kokyu/Kokyu.h b/Kokyu/Kokyu.h
index 0d6c504b43c..0794dfc3b1c 100644
--- a/Kokyu/Kokyu.h
+++ b/Kokyu/Kokyu.h
@@ -13,6 +13,7 @@
 #ifndef KOKYU_H
 #define KOKYU_H
 #include "ace/pre.h"
+#include "ace/Copy_Disabled.h"
 
 //#if !defined (ACE_LACKS_PRAGMA_ONCE)
 //# pragma once
@@ -47,7 +48,7 @@ namespace Kokyu
    * Dispatcher is the class that users will be using to achieve
    * dynamic dispatching of events in an event channel.
    */
-  class Kokyu_Export Dispatcher : private non_copyable
+  class Kokyu_Export Dispatcher : private ACE_Copy_Disabled
   {
   public:
     /// Dispatch a command object based on the qos info supplied.
@@ -81,7 +82,7 @@ namespace Kokyu
    * Factory class creates a dispatcher for EC and configures the
    * interface object with the appropriate implementation.
    */
-  class Kokyu_Export Dispatcher_Factory : private non_copyable
+  class Kokyu_Export Dispatcher_Factory : private ACE_Copy_Disabled
     {
     public:
       /**
diff --git a/Kokyu/Kokyu_defs.h b/Kokyu/Kokyu_defs.h
index be1816b0b9f..d323482532e 100644
--- a/Kokyu/Kokyu_defs.h
+++ b/Kokyu/Kokyu_defs.h
@@ -125,17 +125,6 @@ namespace Kokyu
     private:
       int dont_delete_;
     };
-
-  class Kokyu_Export non_copyable
-  {
-  protected:
-    non_copyable (void);
-    ~non_copyable (void);
-  private:
-    non_copyable (const non_copyable&);
-    const non_copyable& operator= (const non_copyable&);
-  };
-
 } //end of namespace
 
 #if defined (__ACE_INLINE__)
diff --git a/Kokyu/Kokyu_defs.i b/Kokyu/Kokyu_defs.i
index 1613418540d..bb7e43fedd2 100644
--- a/Kokyu/Kokyu_defs.i
+++ b/Kokyu/Kokyu_defs.i
@@ -24,13 +24,4 @@ void Dispatch_Command::destroy (void)
   delete this;
 }
 
-ACE_INLINE
-non_copyable::non_copyable (void) 
-{
-}
-
-ACE_INLINE
-non_copyable::~non_copyable (void) 
-{}
-
 }
diff --git a/Kokyu/Kokyu_dsrt.h b/Kokyu/Kokyu_dsrt.h
index 1bcd404e5f4..4cab7d0676c 100644
--- a/Kokyu/Kokyu_dsrt.h
+++ b/Kokyu/Kokyu_dsrt.h
@@ -11,6 +11,7 @@
 #ifndef KOKYU_DSRT_H
 #define KOKYU_DSRT_H
 #include "ace/pre.h"
+#include "ace/Copy_Disabled.h"
 
 //#if !defined (ACE_LACKS_PRAGMA_ONCE)
 //# pragma once
@@ -48,7 +49,7 @@ namespace Kokyu
    * dynamic scheduling of threads.
    */
   template <class DSRT_Scheduler_Traits>
-  class DSRT_Dispatcher : private non_copyable
+  class DSRT_Dispatcher : private ACE_Copy_Disabled
   {
   public:
     typedef typename DSRT_Scheduler_Traits::Guid_t Guid_t;
@@ -99,7 +100,7 @@ namespace Kokyu
    */
 
   template <class DSRT_Scheduler_Traits>
-  class DSRT_Dispatcher_Factory : private non_copyable
+  class DSRT_Dispatcher_Factory : private ACE_Copy_Disabled
     {
     public:
       typedef auto_ptr<DSRT_Dispatcher<DSRT_Scheduler_Traits> > DSRT_Dispatcher_Auto_Ptr;