Thu Oct 23 11:50:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 28 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 02d0a691c62..401496c6b85 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,8 +1,23 @@
+Thu Oct 23 11:50:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
+        * DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
+        * DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
+        * DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
+        * DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
+        * DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
+        * DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
+        * DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
+        * DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
+        * DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
+          Don't use deprecated TAO_Local_RefCounted_Object
+
 Thu Oct 23 10:28:43 UTC 2008  Simon McQueen  <sm@prismtech.com>
 
         * tests/Bug_3471_Regression/client.cpp:
         * tests/Bug_3471_Regression/server.cpp:
-
           Wchar nonesense.
 
 Thu Oct 23 09:14:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
index e2ff3c5d1cd..92d6825db32 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
@@ -12,7 +12,7 @@
 
 //Class Messenger_i
 class  Messenger_i : public virtual Messenger,
-         public virtual TAO_Local_RefCounted_Object
+         public virtual ::CORBA::LocalObject
 {
 public:
   //Constructor
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
index 2b58bcac096..7169cbef5a9 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
@@ -9,7 +9,7 @@
 
 class ClientInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
   ClientInitializer (void);
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
index 2e4654080e2..95b6966049b 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
@@ -9,7 +9,7 @@
 
 class ClientInterceptor
 : public virtual PortableInterceptor::ClientRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 
  public:
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
index 1d38d9bf30b..0fab8bc1d3b 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
@@ -9,7 +9,7 @@
 
 class ClientInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
  public:
   ClientInitializer (void);
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
index 5423a72f251..6ab15cdda99 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
@@ -10,7 +10,7 @@
 
 class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 
  public:
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
index 61cc85402e4..920bcfd0f0e 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
@@ -7,7 +7,7 @@
 
 class ServerIORInterceptor :
 public virtual PortableInterceptor::IORInterceptor,
-public virtual TAO_Local_RefCounted_Object
+public virtual ::CORBA::LocalObject
 {
  public:
   virtual char * name ();
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
index 0117de7902d..1bd687a032f 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
@@ -10,7 +10,7 @@
 
 class ClientInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
  public:
   ClientInitializer (void);
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
index 9afc212ab1a..15b0129df95 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
@@ -11,7 +11,7 @@
 
 class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 
  public:
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
index 0117de7902d..1bd687a032f 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
@@ -10,7 +10,7 @@
 
 class ClientInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
  public:
   ClientInitializer (void);
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
index 9afc212ab1a..15b0129df95 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
@@ -11,7 +11,7 @@
 
 class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 
  public:
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
index 1d38d9bf30b..0fab8bc1d3b 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
@@ -9,7 +9,7 @@
 
 class ClientInitializer :
   public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
  public:
   ClientInitializer (void);
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
index 8291542ebb3..4a68961eaa5 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
@@ -10,7 +10,7 @@
 
 class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 
  public: