7 files changed, 19 insertions, 9 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 6670ced3e9c..d723e69c33a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Thu Oct 23 11:49:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DevGuideExamples/Messenger/Administrator_exec_i.h
+        * DevGuideExamples/Messenger/History_exec_i.h
+        * DevGuideExamples/Messenger/Messenger_exec_i.h
+        * DevGuideExamples/Messenger/Publication_exec_i.h
+        * DevGuideExamples/Messenger/Receiver_exec_i.h
+        * DevGuideExamples/Messenger/Runnable_exec_i.h
+          Don't use deprecated TAO_Local_RefCounted_Object
+
 Wed Oct 22 08:52:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DevGuideExamples/*:
diff --git a/CIAO/DevGuideExamples/Messenger/Administrator_exec_i.h b/CIAO/DevGuideExamples/Messenger/Administrator_exec_i.h
index 4f71f10dea3..1478115f248 100644
--- a/CIAO/DevGuideExamples/Messenger/Administrator_exec_i.h
+++ b/CIAO/DevGuideExamples/Messenger/Administrator_exec_i.h
@@ -38,7 +38,7 @@ namespace CIDL_Administrator_Impl
   class ADMINISTRATOR_EXEC_Export Administrator_exec_i
   : public virtual Administrator_Exec,
   public virtual ACE_Task_Base,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
   {
     public:
     Administrator_exec_i (void);
@@ -87,7 +87,7 @@ namespace CIDL_Administrator_Impl
 
   class ADMINISTRATOR_EXEC_Export AdministratorHome_exec_i
   : public virtual AdministratorHome_Exec,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
   {
     public:
     AdministratorHome_exec_i (void);
diff --git a/CIAO/DevGuideExamples/Messenger/History_exec_i.h b/CIAO/DevGuideExamples/Messenger/History_exec_i.h
index edf40808a10..4161d8adfb3 100644
--- a/CIAO/DevGuideExamples/Messenger/History_exec_i.h
+++ b/CIAO/DevGuideExamples/Messenger/History_exec_i.h
@@ -40,7 +40,7 @@ namespace CIDL_Messenger_Impl
 {
   class MESSENGER_EXEC_Export History_exec_i
   : public virtual ::CCM_History,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
   {
   public:
     History_exec_i (void);
diff --git a/CIAO/DevGuideExamples/Messenger/Messenger_exec_i.h b/CIAO/DevGuideExamples/Messenger/Messenger_exec_i.h
index 3c5c30a17f0..32ed93690b8 100644
--- a/CIAO/DevGuideExamples/Messenger/Messenger_exec_i.h
+++ b/CIAO/DevGuideExamples/Messenger/Messenger_exec_i.h
@@ -44,7 +44,7 @@ namespace CIDL_Messenger_Impl
 
   class MESSENGER_EXEC_Export Messenger_exec_i
   : public virtual Messenger_Exec,
-    public virtual TAO_Local_RefCounted_Object,
+    public virtual ::CORBA::LocalObject,
     public virtual ACE_Task_Base
   {
     public:
@@ -111,7 +111,7 @@ namespace CIDL_Messenger_Impl
 
   class MESSENGER_EXEC_Export MessengerHome_exec_i
   : public virtual MessengerHome_Exec,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
   {
     public:
     MessengerHome_exec_i (void);
diff --git a/CIAO/DevGuideExamples/Messenger/Publication_exec_i.h b/CIAO/DevGuideExamples/Messenger/Publication_exec_i.h
index 26f6df24401..1163c88d95e 100644
--- a/CIAO/DevGuideExamples/Messenger/Publication_exec_i.h
+++ b/CIAO/DevGuideExamples/Messenger/Publication_exec_i.h
@@ -40,7 +40,7 @@ namespace CIDL_Messenger_Impl
 {
   class MESSENGER_EXEC_Export Publication_exec_i
   : public virtual ::CCM_Publication,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
   {
   public:
     Publication_exec_i ( const char* text,
diff --git a/CIAO/DevGuideExamples/Messenger/Receiver_exec_i.h b/CIAO/DevGuideExamples/Messenger/Receiver_exec_i.h
index c56055080c4..208c330a4b5 100644
--- a/CIAO/DevGuideExamples/Messenger/Receiver_exec_i.h
+++ b/CIAO/DevGuideExamples/Messenger/Receiver_exec_i.h
@@ -36,7 +36,7 @@ namespace CIDL_Receiver_Impl
 {
   class RECEIVER_EXEC_Export Receiver_exec_i
   : public virtual Receiver_Exec,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
   {
     public:
     Receiver_exec_i (void);
@@ -79,7 +79,7 @@ namespace CIDL_Receiver_Impl
 
   class RECEIVER_EXEC_Export ReceiverHome_exec_i
   : public virtual ReceiverHome_Exec,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
   {
     public:
     ReceiverHome_exec_i (void);
diff --git a/CIAO/DevGuideExamples/Messenger/Runnable_exec_i.h b/CIAO/DevGuideExamples/Messenger/Runnable_exec_i.h
index 473b125ddc2..569d12143e4 100644
--- a/CIAO/DevGuideExamples/Messenger/Runnable_exec_i.h
+++ b/CIAO/DevGuideExamples/Messenger/Runnable_exec_i.h
@@ -39,7 +39,7 @@ namespace CIDL_Messenger_Impl
 {
   class MESSENGER_EXEC_Export Runnable_exec_i
   : public virtual ::CCM_Runnable,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
   {
   public:
     Runnable_exec_i ();