ChangeLogTag: Wed Mar 15 19:20:17 2000 Balachandran Natarajan <bala@cs.wustl.edu>

25 files changed, 44 insertions, 9 deletions

diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index cf316bd0ed8..b2822aa070d 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -17,6 +17,8 @@
 
 ACE_RCSID(tao, Acceptor_Registry, "$Id$")
 
+
+
 TAO_Acceptor_Registry::TAO_Acceptor_Registry (void)
   : acceptors_ (0),
     size_ (0)
diff --git a/TAO/tao/Active_Object_Map.cpp b/TAO/tao/Active_Object_Map.cpp
index 11ffc32b64f..e3bf5c52c56 100644
--- a/TAO/tao/Active_Object_Map.cpp
+++ b/TAO/tao/Active_Object_Map.cpp
@@ -1,5 +1,4 @@
 // $Id$
-
 #include "tao/Active_Object_Map.h"
 
 #if !defined (__ACE_INLINE__)
@@ -10,6 +9,7 @@
 
 ACE_RCSID(tao, Active_Object_Map, "$Id$")
 
+
 TAO_Active_Object_Map::Map_Entry::Map_Entry (void)
   : user_id_ (),
     system_id_ (),
diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h
index 1112d7b783b..457c9f263c0 100644
--- a/TAO/tao/Asynch_Invocation.h
+++ b/TAO/tao/Asynch_Invocation.h
@@ -1,6 +1,7 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
+
 // ============================================================================
 //
 // = LIBRARY
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index eb573600bd1..fa7be70cea4 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -1,5 +1,6 @@
 /* -*- C++ -*- */
 //$Id$
+
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
 // Distributed Object Computing at Washington University, St. Louis.
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index dc48b5a48c6..b63a124d3ce 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+
 #include "tao/Buffering_Constraint_Policy.h"
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
diff --git a/TAO/tao/Buffering_Constraint_Policy.i b/TAO/tao/Buffering_Constraint_Policy.i
index 6a7f3a8df4e..92b7a9af7ba 100644
--- a/TAO/tao/Buffering_Constraint_Policy.i
+++ b/TAO/tao/Buffering_Constraint_Policy.i
@@ -11,3 +11,4 @@ TAO_Buffering_Constraint_Policy::buffering_constraint (void)
 {
   return this->buffering_constraint_;
 }
+
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 3755ec6ffe6..7d2a41a04c2 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+
 // Portions of this file are:
 // Copyright 1994-1995 by Sun Microsystems Inc.
 // All Rights Reserved
@@ -43,6 +44,7 @@
 
 ACE_RCSID(tao, CDR, "$Id$")
 
+
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_CDR_Timeprobe_Description[] =
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 45f7ab8c271..56839afbc07 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -1,6 +1,9 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
+// $Id$
+
+
 // ============================================================================
 //
 // = LIBRARY
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index fd43b7efa2b..4a1cc01f3c0 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -1,4 +1,5 @@
 // $Id$
+
 //
 // ================================================================
 //
@@ -353,7 +354,6 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
                                        CONV_FRAME::CodeSetContext *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, 
                                        const CONV_FRAME::CodeSetContext *&);
-
 #ifndef __ACE_INLINE__
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponent &);
diff --git a/TAO/tao/Client_Priority_Policy.cpp b/TAO/tao/Client_Priority_Policy.cpp
index a0ce82e96fc..6fafae0bc9d 100644
--- a/TAO/tao/Client_Priority_Policy.cpp
+++ b/TAO/tao/Client_Priority_Policy.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+
 #include "tao/Client_Priority_Policy.h"
 
 #if ! defined (__ACE_INLINE__)
diff --git a/TAO/tao/Client_Priority_Policy.i b/TAO/tao/Client_Priority_Policy.i
index bbbd94029d1..0811902a8b0 100644
--- a/TAO/tao/Client_Priority_Policy.i
+++ b/TAO/tao/Client_Priority_Policy.i
@@ -1,5 +1,6 @@
+/* -*- C++ -*- */
 // $Id$
-
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
+
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 051b2da91bd..d514f92cc20 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -1,5 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
+
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO ORB and the TAO IDL Compiler have been developed by Washington
 // University Computer Science's Distributed Object Computing Group.
@@ -19,6 +20,7 @@
 #include "tao/CurrentC.i"
 #endif /* !defined INLINE */
 
+
 ACE_RCSID(tao, CurrentC, "$Id$")
 
 CORBA_Current_ptr CORBA_Current::_duplicate (CORBA_Current_ptr obj)
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index fb4cb68d5fb..643350c3bcf 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -1,6 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
+
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 //
 // And later modified by Jeff Parsons
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 0c92495996e..bf112f37da3 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -1,6 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
+
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
 // Distributed Object Computing at Washington University, St. Louis.
diff --git a/TAO/tao/DomainS.cpp b/TAO/tao/DomainS.cpp
index b1ab2782837..b4165cd23ed 100644
--- a/TAO/tao/DomainS.cpp
+++ b/TAO/tao/DomainS.cpp
@@ -1,6 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
+
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
 // Distributed Object Computing at Washington University, St. Louis.
diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp
index 927314ffb1d..b9fa1fd4e15 100644
--- a/TAO/tao/DynEnum_i.cpp
+++ b/TAO/tao/DynEnum_i.cpp
@@ -1,5 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
+
 // ===================================================================
 //
 // = LIBRARY
diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp
index 318ba8a45ad..369797c6345 100644
--- a/TAO/tao/DynStruct_i.cpp
+++ b/TAO/tao/DynStruct_i.cpp
@@ -1,6 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
+
+
 // ====================================================================
 //
 // = LIBRARY
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
index 35021bfccc5..f36cf58f7ee 100644
--- a/TAO/tao/DynUnion_i.cpp
+++ b/TAO/tao/DynUnion_i.cpp
@@ -1,6 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
+
 #include "tao/DynAny_i.h"
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index cbc6fb8facf..a51befe971c 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -10,6 +10,7 @@
 
 ACE_RCSID(tao, Environment, "$Id$")
 
+
 #if 0
 CORBA_Environment::CORBA_Environment (void)
   : exception_ (0),
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 63a24296780..226f26aab0b 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -1,5 +1,6 @@
 //
 // $Id$
+
 //
 // ================================================================
 //
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 286278acd76..721f5cf0956 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -1,6 +1,7 @@
 /* -*- C++ -*- */
 //
 // $Id$
+
 //
 // ================================================================
 //
@@ -623,6 +624,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, 
                                        const IOP::ServiceContextList *&);
 
+
 #ifndef __ACE_INLINE__
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &);
diff --git a/TAO/tao/IORC.cpp b/TAO/tao/IORC.cpp
index bf314cce209..a4ac85e380b 100644
--- a/TAO/tao/IORC.cpp
+++ b/TAO/tao/IORC.cpp
@@ -1,6 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
+
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
 // Distributed Object Computing at Washington University, St. Louis.
@@ -20,6 +21,8 @@
 
 ACE_RCSID(tao, IORC, "$Id$")
 
+
+
 TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
@@ -503,10 +506,12 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipul
         return 0;
       }
     ACE_TRY_CHECK;
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
       );
+
     CORBA::Object_var _tao_obj_var;
     if (stream >> _tao_obj_var.out ())
     {
diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h
index 5a5a5bf9ee9..4c52fccca98 100644
--- a/TAO/tao/IORC.h
+++ b/TAO/tao/IORC.h
@@ -1,6 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
+
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
 // Distributed Object Computing at Washington University, St. Louis.
@@ -522,7 +523,6 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
                                        TAO_IOP::TAO_IOR_Manipulation::IORList *&);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, 
                                        const TAO_IOP::TAO_IOR_Manipulation::IORList *&);
-
 #ifndef __ACE_INLINE__
 
 TAO_Export CORBA::Boolean
diff --git a/TAO/tao/IOR_LookupTable.cpp b/TAO/tao/IOR_LookupTable.cpp
index 7cc6cc2bad4..7529a91ebbe 100644
--- a/TAO/tao/IOR_LookupTable.cpp
+++ b/TAO/tao/IOR_LookupTable.cpp
@@ -1,11 +1,14 @@
 // $Id$
 
+
+
 #include "tao/IOR_LookupTable.h"
 #include "tao/ObjectIDList.h"
 #include "tao/Exception.h"
 #include "tao/Environment.h"
 #include "tao/debug.h"
 
+
 ACE_RCSID(tao, IOR_TableLookup, "$Id$")
 
 int 
diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp
index e486eebbed1..dcfdb4a0c37 100644
--- a/TAO/tao/Request.cpp
+++ b/TAO/tao/Request.cpp
@@ -6,7 +6,8 @@
 
 #include "tao/Object.h"
 #include "tao/Stub.h"
-#include "tao/GIOP.h"
+#include "tao/Pluggable_Messaging_Utils.h"
+
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Request.i"
@@ -191,7 +192,7 @@ CORBA_Request::handle_response (TAO_InputCDR &incoming,
 {
   switch (reply_status)
   {
-    case TAO_GIOP_NO_EXCEPTION:
+    case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION:
       if (this->result_ != 0)
         {
           this->result_->value ()->_tao_decode (incoming,
@@ -214,9 +215,9 @@ CORBA_Request::handle_response (TAO_InputCDR &incoming,
       }
 
       break;
-    case TAO_GIOP_USER_EXCEPTION:
-    case TAO_GIOP_SYSTEM_EXCEPTION:
-    case TAO_GIOP_LOCATION_FORWARD:
+    case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
+    case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION:
+    case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
     default:
       // @@ (JP) Don't know what to do about any of these yet.
       ACE_ERROR ((LM_ERROR,