ChangeLogTag: Tue Nov 16 13:04:12 UTC 2004 Martin Corino <mcorino@remedy.nl>

28 files changed, 125 insertions, 71 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index be6b68d0b2a..747a255b76f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,41 @@
+Tue Nov 16 13:04:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+
+	* tao/BoundsA.cpp:
+	* tao/PolicyA.cpp:
+	* tao/PortableInterceptorA.cpp:
+	* tao/WrongTransactionA.cpp:
+	* tao/Messaging/MessagingC.cpp:
+	* tao/PortableServer/PortableServerA.cpp:
+	* tao/IORManipulation/IORA.cpp:
+	  Fixed missing includes for f.i. VxWorks builds because of IDL compiler
+	  bug in case of special build configs.
+	  IDL compiler has also been fixed so files will be correctly regenerated
+	  next time (when POA refactoring is complete).
+
+	* tao/Any.cpp:
+	* tao/Codeset_Manager.cpp:
+	* tao/Codeset_Translator_Factory.cpp:
+	* tao/GIOPC.cpp:
+	* tao/ORBInitializer_Registry.cpp:
+	* tao/Transport.cpp:
+	* tao/UTF16_BOM_Factory.cpp:
+	* tao/Utils/RIR_Narrow.cpp:
+	* tests/Bug_1361_Regression/shutdown.cpp:
+	* tests/CDR/basic_types.cpp:
+	* tests/CDR/growth.cpp:
+	* tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp:
+	* tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp:
+	* tests/CodeSets/simple/client.cpp:
+	* tests/CodeSets/simple/server.cpp:
+	* tests/Collocation/Diamond_i.h:
+	* tests/IORManipulation/IORTest.cpp:
+	* tests/POA/Policies/Policies.cpp:
+	* tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp:
+	  Fixed missing includes and iostream incompatibilities for VxWorks builds.
+
+	* tests/Servant_To_Reference_Test/Servant_to_Reference.mpc:
+	  Fixed double link of Test_i.o because .h was added to Source_Files.
+
 Mon Nov 15 15:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/AMH_Exceptions/AMH_Exceptions.mpc:
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 1ff27056605..0a1d56b8ba4 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -8,6 +8,8 @@
 #include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
+#include "tao/SystemException.h"
+#include "tao/CDR.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp
index c43dea7e3c3..ec054b374ec 100644
--- a/TAO/tao/BoundsA.cpp
+++ b/TAO/tao/BoundsA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "BoundsC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 63f064731d0..861155eccaf 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -9,6 +9,7 @@
 #include "tao/SystemException.h"
 #include "tao/UTF16_BOM_Factory.h"
 #include "tao/debug.h"
+#include "tao/CDR.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Codeset_Registry.h"
diff --git a/TAO/tao/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset_Translator_Factory.cpp
index a2d660952df..58ee5fb5ada 100644
--- a/TAO/tao/Codeset_Translator_Factory.cpp
+++ b/TAO/tao/Codeset_Translator_Factory.cpp
@@ -9,7 +9,7 @@
 //    Codeset_Translator_Factory.cpp
 //
 // = DESCRIPTION
-//    The base for all the translator factories. Translator factories are 
+//    The base for all the translator factories. Translator factories are
 //    responsible for supplying the proper translator on demand.
 //
 // = AUTHORS
@@ -17,7 +17,8 @@
 //
 // ============================================================================
 
-#include "Codeset_Translator_Factory.h"
+#include "tao/Codeset_Translator_Factory.h"
+#include "tao/CDR.h"
 
 ACE_RCSID (tao,
            Codeset_Translator_Factory,
@@ -41,7 +42,7 @@ TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR **)
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_InputCDR *cdr, 
+    TAO_InputCDR *cdr,
     ACE_Char_Codeset_Translator *trans
   ) const
 {
@@ -50,7 +51,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_OutputCDR *cdr, 
+    TAO_OutputCDR *cdr,
     ACE_Char_Codeset_Translator *trans
   ) const
 {
@@ -59,7 +60,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_InputCDR *cdr, 
+    TAO_InputCDR *cdr,
     ACE_WChar_Codeset_Translator *trans
   ) const
 {
@@ -68,7 +69,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 
 void
 TAO_Codeset_Translator_Factory::assign_i (
-    TAO_OutputCDR *cdr, 
+    TAO_OutputCDR *cdr,
     ACE_WChar_Codeset_Translator *trans
   ) const
 {
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 60d228acfeb..19ab00c3dc2 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -32,6 +32,7 @@
 #include "GIOPC.h"
 #include "tao/CDR.h"
 #include "tao/Typecode.h"
+#include "tao/Any.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -51,10 +52,10 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 GIOP::Version::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -64,10 +65,10 @@ GIOP::Version::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 GIOP::IORAddressingInfo::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -162,10 +163,10 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
     {
       return *this;
     }
-  
+
   this->_reset (u.disc_, 0);
   this->disc_ = u.disc_;
-  
+
   switch (this->disc_)
   {
     case 0:
@@ -219,7 +220,7 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
     default:
     break;
   }
-  
+
   return *this;
 }
 
@@ -303,9 +304,9 @@ CORBA::Boolean operator<< (
     {
       return 0;
     }
-  
+
   CORBA::Boolean result = 1;
-  
+
   switch (_tao_union._d ())
   {
     case 0:
@@ -326,7 +327,7 @@ CORBA::Boolean operator<< (
     default:
       break;
   }
-  
+
   return result;
 }
 
@@ -340,16 +341,16 @@ CORBA::Boolean operator>> (
     {
       return 0;
     }
-  
+
   CORBA::Boolean result = 1;
-  
+
   switch (_tao_discriminant)
   {
     case 0:
       {
         CORBA::OctetSeq _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.object_key (_tao_union_tmp);
@@ -361,7 +362,7 @@ CORBA::Boolean operator>> (
       {
         IOP::TaggedProfile _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.profile (_tao_union_tmp);
@@ -373,7 +374,7 @@ CORBA::Boolean operator>> (
       {
         GIOP::IORAddressingInfo _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.ior (_tao_union_tmp);
@@ -385,7 +386,7 @@ CORBA::Boolean operator>> (
       _tao_union._d (_tao_discriminant);
       break;
   }
-  
+
   return result;
 }
 
@@ -480,5 +481,5 @@ CORBA::Boolean operator>> (
         GIOP::TargetAddress_var \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index 71ce086e877..8b1daf136d4 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IORManip_Loader.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index 31b5a52dcc6..2c7af6e248c 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "Messaging.h"
+#include "tao/Any.h"
 #include "tao/CDR.h"
 #include "tao/Object_T.h"
 #include "tao/Typecode.h"
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index 4a7aa25a200..c6208e7905b 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -7,6 +7,7 @@
 #include "SystemException.h"
 
 #include "ace/Static_Object_Lock.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 
 ACE_RCSID (tao,
diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp
index 8e78add1e30..ca52f598306 100644
--- a/TAO/tao/PolicyA.cpp
+++ b/TAO/tao/PolicyA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PolicyC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp
index 05450612758..b825a03d79a 100644
--- a/TAO/tao/PortableInterceptorA.cpp
+++ b/TAO/tao/PortableInterceptorA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableInterceptorC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index cc94da26878..448ef21aa35 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -26,6 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableServerC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index df1e0ffcfe9..16f5fcd1c3c 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -19,6 +19,7 @@
 #include "Codeset_Manager.h"
 #include "Codeset_Translator_Factory.h"
 #include "debug.h"
+#include "CDR.h"
 
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/tao/UTF16_BOM_Factory.cpp b/TAO/tao/UTF16_BOM_Factory.cpp
index e98acb4271c..98f6ed56d7c 100644
--- a/TAO/tao/UTF16_BOM_Factory.cpp
+++ b/TAO/tao/UTF16_BOM_Factory.cpp
@@ -19,6 +19,7 @@
 
 #include "UTF16_BOM_Factory.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/Log_Msg.h"
 
 // Instantiate templates that allow discovery of this factory
 // via the Service Manager.
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index 1dbd0e94b96..18299880b5a 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -3,7 +3,9 @@
 
 #include "RIR_Narrow.h"
 #include "tao/SystemException.h"
-#include <stdexcept>
+#if defined (ACE_HAS_EXCEPTIONS)
+  #include <stdexcept>
+#endif
 
 ACE_RCSID (Utils,
            RIR_Narror,
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
index acec61525a9..a387ab6aa3c 100644
--- a/TAO/tao/WrongTransactionA.cpp
+++ b/TAO/tao/WrongTransactionA.cpp
@@ -29,6 +29,7 @@
 #include "tao/Typecode.h"
 #include "tao/SystemException.h"
 #include "tao/Any_Dual_Impl_T.h"
+#include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/typecode_defn.cpp:290
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index 64fc5963c0b..ba1eb1160f0 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -16,7 +16,8 @@ parse_args (int argc, char *argv[]);
 int
 main (int argc, char *argv[])
 {
-	cout << "Starting shutdown" << endl;
+  ACE_DEBUG ((LM_DEBUG,
+             "Starting shutdown\n"));
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index cb2d21ec0a3..656025779a4 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -23,6 +23,7 @@
 #include "tao/Any.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (CDR,
            basic_types,
diff --git a/TAO/tests/CDR/growth.cpp b/TAO/tests/CDR/growth.cpp
index ead4518df27..0ddc7e78f86 100644
--- a/TAO/tests/CDR/growth.cpp
+++ b/TAO/tests/CDR/growth.cpp
@@ -19,6 +19,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/Log_Msg.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp
index 9ef933f5a76..47be0f23d87 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp
@@ -20,6 +20,7 @@
 // ============================================================================
 
 #include "Char_IBM1047_ISO8859_Factory.h"
+#include "ace/Log_Msg.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp
index 60da234be4c..73cafb5042f 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp
@@ -21,6 +21,7 @@
 // ============================================================================
 
 #include "Wchar_IBM1047_ISO8859_Factory.h"
+#include "ace/Log_Msg.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp
index 8214764827a..b11c570033d 100644
--- a/TAO/tests/CodeSets/simple/client.cpp
+++ b/TAO/tests/CodeSets/simple/client.cpp
@@ -24,6 +24,7 @@
 #include "ace/streams.h"
 
 #include "ace/OS_NS_string.h"
+#include "ace/Log_Msg.h"
 
 wchar_t *
 make_wstring (const char *str)
@@ -34,12 +35,14 @@ make_wstring (const char *str)
 
   int len = strlen (str) + 1;
   wchar_t *wstr = new wchar_t[len];
-  cout << "make_wstring: str = " << str << endl;
+  ACE_DEBUG ((LM_DEBUG,
+              "make_wstring: str = %s\n",str));
   for (int i = 0; i < len; i++)
     {
       char *t = ACE_const_cast (char *, str);
       wstr[i] = ACE_static_cast (wchar_t, *(t + i));
-      cout << "wstr[" << i << "] = " << (short)wstr[i] << endl;
+      ACE_DEBUG ((LM_DEBUG,
+	              "wstr[%d] = %d\n", i, (short)wstr[i]));
     }
   return wstr;
 }
@@ -64,18 +67,7 @@ int main (int argc, char *argv[])
       // Get IOR from command line (or file)
       if (argc != 2)
         {
-          ifstream fstr;
-          fstr.open ("server.ior");
-
-          if (fstr.bad ())
-            {
-              cout << "Cannot open server.ior and no IOR argument!" << endl;
-              exit (1);
-            }
-          else
-            {
-              fstr >> buf;
-            }
+		  ACE_OS::strcpy (buf, "file://server.ior");
         }
       else
         {
@@ -111,16 +103,16 @@ int main (int argc, char *argv[])
       const char *any_reply;
       outarg >>= any_reply;
 
-      cout << "Client sent " << bare_string
-           << ", got " << reply.in () << endl;
+      ACE_DEBUG ((LM_DEBUG,
+                 "Client sent %s, got %s\n", bare_string, reply.in () ));
 
       if (ACE_OS::strcmp (bare_string, reply.in ()) != 0)
         {
           ++error_count;
         }
 
-      cout << "Client sent " << any_string
-           << ", got " << any_reply << endl;
+      ACE_DEBUG ((LM_DEBUG,
+                 "Client sent %s, got %s\n", any_string, any_reply ));
 
       if (ACE_OS::strcmp (any_string, any_reply) != 0)
         {
@@ -129,7 +121,8 @@ int main (int argc, char *argv[])
 #if defined (ACE_HAS_WCHAR)
       wchar_t *wide_string = ACE_OS::strdup(ACE_TEXT_ALWAYS_WCHAR ("Wide String"));
       wchar_t *wide_reply = server->op2 (wide_string);
-      cout << "sent " << wide_string << " got " << wide_reply << endl;
+      ACE_DEBUG ((LM_DEBUG,
+                  "sent %W, got %W\n", wide_string, wide_reply));
 #endif /* ACE_HAS_WCHAR */
     }
   ACE_CATCHANY
diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp
index d8cb504aca9..5004bd9b854 100644
--- a/TAO/tests/CodeSets/simple/server.cpp
+++ b/TAO/tests/CodeSets/simple/server.cpp
@@ -38,10 +38,12 @@ public:
               ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    cout << "Server: bare string: " << name << endl;
+    ACE_DEBUG ((LM_DEBUG,
+                "Server: bare string: %s\n", name));
     const char *any_str;
     inany >>= any_str;
-    cout << "Server: inserted string: " << any_str << endl << endl;
+    ACE_DEBUG ((LM_DEBUG,
+                "Server: inserted string: %s\n\n", any_str));
 
     CORBA::Any *out_ptr = 0;
     ACE_NEW_RETURN (out_ptr,
@@ -85,7 +87,8 @@ int main(int argc, char *argv[])
       // Check POA
       if (CORBA::is_nil (poa_object.in ()))
         {
-          cout << "Couldn't initialize POA" << endl;
+          ACE_DEBUG ((LM_DEBUG,
+                     "Couldn't initialize POA\n"));
           return 1;
         }
 
@@ -115,18 +118,14 @@ int main(int argc, char *argv[])
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ofstream fstr;
-      fstr.open ("server.ior");
-
-      if (fstr.bad ())
-        {
-          cout << "Cannot open server.ior!" << endl;
-          exit (1);
-        }
-      else
-        {
-          fstr << ior.in () << endl;
-        }
+      FILE *output_file= ACE_OS::fopen ("server.ior", "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           "server.ior"),
+                              1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
 
       // Activate POA manager
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index 1400bbb5696..9e248a81dbd 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -17,7 +17,7 @@ public:
   ~Top_i (void);
   // Ctor and dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 };
@@ -29,11 +29,11 @@ public:
   ~Left_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 };
@@ -45,15 +45,15 @@ public:
   ~Right_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 };
@@ -65,19 +65,19 @@ public:
   ~Buttom_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the name of the object.
 };
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index 0a3712366e6..29313aad9b1 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -12,6 +12,7 @@
 //=========================================================================
 
 
+#include "ace/Log_Msg.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp
index c31411e2720..cc25f6679b9 100644
--- a/TAO/tests/POA/Policies/Policies.cpp
+++ b/TAO/tests/POA/Policies/Policies.cpp
@@ -19,6 +19,7 @@
 //=========================================================================
 
 #include "tao/ORB.h"
+#include "tao/Any.h"
 #include "tao/PortableServer/PortableServer.h"
 
 #include "ace/Log_Msg.h"
diff --git a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
index f57d76b3b91..9c240b72452 100644
--- a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
+++ b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
@@ -5,11 +5,10 @@ project(*Server): taoexe, portableserver, minimum_corba {
   Source_Files {
     server.cpp
     Test_i.cpp
-    Test_i.h
     TestC.cpp
     TestS.cpp
   }
-  
+
   IDL_Files {
     Test.idl
   }
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index b7777cd8cd0..1532085179d 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -3,6 +3,7 @@
 #include "Smart_Proxy_Impl.h"
 
 #include "ace/OS_NS_string.h"
+#include "ace/Log_Msg.h"
 
 Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory (void)
 {