ChangeLogTag:Sat Nov 8 23:58:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

12 files changed, 22 insertions, 20 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 045c1b492f6..e72a0e64155 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Sat Nov  8 23:58:14 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tests/File_IO/client.cpp
+	* tests/IDL_Test/main.cpp
+	* tests/MProfile/client.cpp:
+	* tests/MT_BiDir/Sender_i.cpp:
+	* tests/Multiple_Inheritance/client.cpp
+	* tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp:
+	* tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp:
+	* tests/Two_Objects/server.cpp:
+	* tao/corbafwd.h:
+	* utils/catior/catior.cpp:
+	* utils/catior/catior.mpc:
+
+	  Fixed fuzz errors.
+
 Sun Nov  9 05:53:59 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
 	* tao/TypeCodeFactory/TypeCodeFactoryC.cpp:
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 98a9dabf433..c7f391bea44 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -42,10 +42,6 @@
 # include "tao/corbafwd.i"
 #endif /* ! __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_CORBAFWD_H */
diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index 2b6982ed089..189a81e3d59 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -17,7 +17,6 @@
 
 #include "FileC.h"
 #include "tao/debug.h"
-#include "ace/streams.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS.h"
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index b0c27c126a5..f9c641c873d 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -22,7 +22,6 @@
 #include "pragmaS.h"
 #include "unionC.h"
 #include "repo_id_modC.h"
-#include "ace/streams.h"
 #include "ace/OS_NS_string.h"
 
 class hello_i : public virtual POA_hello
@@ -221,7 +220,6 @@ main (int argc , char *argv[])
       if (ACE_OS::strcmp (s_schmendrick._interface_repository_id (),
                           "IDL:floop_prefix/gleep/floop/schmendrick:524.23"))
         {
-         cout << s_schmendrick._interface_repository_id () << endl;
           ++error_count;
           ACE_DEBUG ((LM_DEBUG,
                       "pragma prefix error in object 'schmendrick'\n"));
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index 64f90dcb440..278a760a3c2 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -4,7 +4,6 @@
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 #include "testC.h"
-#include "ace/streams.h"
 
 ACE_RCSID(MT_Server, client, "$Id$")
 
@@ -128,15 +127,11 @@ void run_test (Simple_Server_ptr server
       ACE_TRY
         {
           // Make a remote call
-          cout << "Remote call "<<endl;
           CORBA::Long ret=
             server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          cout << "The retval is .. " << ret << endl;
-          cout << "Kill Primary... " <<endl;
           ACE_OS::sleep (25);
-          cout << "Hope you have .." <<endl;
         }
       ACE_CATCH (CORBA::TRANSIENT, t)
         {
diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp
index 799188f88b6..780f39d18ad 100644
--- a/TAO/tests/MT_BiDir/Sender_i.cpp
+++ b/TAO/tests/MT_BiDir/Sender_i.cpp
@@ -1,5 +1,4 @@
 #include "Sender_i.h"
-#include "ace/streams.h"
 #include "ace/Manual_Event.h"
 
 
@@ -50,8 +49,6 @@ Sender_i::receiver_object (Receiver_ptr recv
 
   if (this->last_index_ == this->no_clients_)
     {
-      cout << "About to signal events " << this->last_index_ << endl;
-      cout << "About to signal events " << this->no_clients_ << endl;
       this->event_.signal ();
     }
 
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index 266531a239f..8406386f614 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -15,7 +15,6 @@
 //
 //====================================================================
 
-#include "ace/streams.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "Multiple_InheritanceC.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
index b6755284944..d879e719298 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
@@ -3,7 +3,6 @@
 //
 #include "Server_Task.h"
 #include "test_i.h"
-#include "ace/streams.h"
 
 #include "ace/Manual_Event.h"
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
index 037f9310273..ade05ba7202 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
@@ -48,7 +48,9 @@ void
 Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->_remove_ref ();
+  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
   this->orb_->shutdown (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index 0aab902c36d..639cb344ab8 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -3,7 +3,6 @@
 #include "worker.h"
 #include "Object_Factory_i.h"
 #include "ace/Get_Opt.h"
-#include "ace/streams.h"
 #include "ace/Task.h"
 
 ACE_RCSID(Test, server, "$Id$")
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index 9ad5b100fac..f95bce30896 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -17,6 +17,7 @@
 //      Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com>
 //
 // ============================================================================
+// FUZZ: disable check_for_streams_include
 
 #include "ace/Codeset_Registry.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/utils/catior/catior.mpc b/TAO/utils/catior/catior.mpc
index f9922592ca1..6c5ed2405a2 100644
--- a/TAO/utils/catior/catior.mpc
+++ b/TAO/utils/catior/catior.mpc
@@ -1,3 +1,4 @@
+// $Id$
 project : taoexe, rtcorba {
   install = $(ACE_ROOT)/bin
-}
\ No newline at end of file
+}