Merged revisions 81249 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO

........
  r81249 | iliyan | 2008-04-05 19:14:50 -0500 (Sat, 05 Apr 2008) | 1 line
  
  ChangeLogTag: Sun Apr  6 00:03:27 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
........

6 files changed, 20 insertions, 2 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 38dd523dda8..40c4b5d9692 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Sun Apr  6 00:03:27 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
+        * tests/ORB_Local_Config/Bug_1459/Test.cpp:
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
+        * tests/ORB_Local_Config/Separation/Test.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+        * tests/ORB_Local_Config/Shared/Test.cpp:
+        * tests/ORB_Local_Config/Simple/Test.cpp:
+
+        Changes to account for the intrusive-recounted-ness of
+        ACE_Service_Gestalt instances.
+
 Fri Apr  4 22:15:16 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         This is the first batch of changes related to the refactoring of
diff --git a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
index eabcf800d7d..9098c08edb4 100644
--- a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
@@ -7,6 +7,7 @@
 
 #include "ace/ARGV.h"
 #include "ace/Service_Config.h"
+#include "ace/Intrusive_Auto_Ptr.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (tests, server, "$Id$")
diff --git a/TAO/tests/ORB_Local_Config/Separation/Test.cpp b/TAO/tests/ORB_Local_Config/Separation/Test.cpp
index dd11fe43c0c..8055b7d2d89 100644
--- a/TAO/tests/ORB_Local_Config/Separation/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Separation/Test.cpp
@@ -5,6 +5,7 @@
 #include "tao/IIOP_Factory.h"
 
 #include "ace/Service_Config.h"
+#include "ace/Intrusive_Auto_Ptr.h"
 #include "ace/Dynamic_Service.h"
 
 #include "Service_Configuration_Per_ORB.h"
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
index 9f7e0366424..becdb20c1ee 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
@@ -9,6 +9,7 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Dynamic_Service_Dependency.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Intrusive_Auto_Ptr.h"
 
 #include "Service_Configuration_Per_ORB.h"
 
diff --git a/TAO/tests/ORB_Local_Config/Shared/Test.cpp b/TAO/tests/ORB_Local_Config/Shared/Test.cpp
index bcc69ce6b99..0416abddc8a 100644
--- a/TAO/tests/ORB_Local_Config/Shared/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Shared/Test.cpp
@@ -4,6 +4,7 @@
 #include "tao/CORBALOC_Parser.h"
 #include "tao/Protocol_Factory.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Intrusive_Auto_Ptr.h"
 
 #include "Service_Configuration_Per_ORB.h"
 
@@ -66,12 +67,12 @@ testReusingGlobals (int , ACE_TCHAR *[])
   svcname = ACE_TEXT ("CORBANAME_Parser");
   ACE_Service_Object* p2 = ACE_Dynamic_Service<ACE_Service_Object>::instance (two.get (), svcname);
 
-  if (p2 == 0) // You should be able to find the same stuff here, too``
+  if (p2 == 0) // You should be able to find the same stuff here, too
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Not expected to find %s in the global repo\n"), svcname));
       return -1;
     }
-
+  
   return 0;
 }
 
diff --git a/TAO/tests/ORB_Local_Config/Simple/Test.cpp b/TAO/tests/ORB_Local_Config/Simple/Test.cpp
index 664f41b49a3..b2db8cc4308 100644
--- a/TAO/tests/ORB_Local_Config/Simple/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Simple/Test.cpp
@@ -4,6 +4,7 @@
 #include "tao/CORBALOC_Parser.h"
 #include "tao/Protocol_Factory.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Intrusive_Auto_Ptr.h"
 
 #include "Service_Configuration_Per_ORB.h"