Mon Mar 18 17:43:49 2002 Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>

2 files changed, 76 insertions, 65 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 8576a02a8cf..f5443e32522 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Mon Mar 18 17:43:49 2002  Jaiganesh Balasubramanian  <jai@doc.ece.uci.edu>
+
+	* tao/Messaging/diffs/Messaging.diff:
+	  Updated the diffs file for the latest changes in the Messaging
+	  library.
+
 Mon Mar 18 18:37:07 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Messaging/Messaging.h: 
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff
index 61ee46dd7b8..ea5677c23d9 100644
--- a/TAO/tao/Messaging/diffs/Messaging.diff
+++ b/TAO/tao/Messaging/diffs/Messaging.diff
@@ -1,5 +1,5 @@
---- orig/MessagingC.h	Wed Mar  6 15:04:36 2002
-+++ MessagingC.h	Wed Mar  6 15:08:22 2002
+--- orig/MessagingC.h	Mon Mar 18 17:42:36 2002
++++ MessagingC.h	Mon Mar 18 17:34:37 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,9 +8,14 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -23,17 +23,28 @@
+@@ -22,18 +22,33 @@
+ #ifndef _TAO_IDL_ORIG_MESSAGINGC_H_
  #define _TAO_IDL_ORIG_MESSAGINGC_H_
  
++#ifndef TAO_MESSAGING_SAFE_INCLUDE
++#error "You should not include MessagingC.h directly, use Messaging.h"
++#endif /* !TAO_MESSAGING_SAFE_INCLUDE */
++
  #include "ace/pre.h"
 -#include "tao/corba.h"
 +#include "tao/orbconf.h"
@@ -43,7 +48,7 @@
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -58,6 +69,11 @@
+@@ -58,6 +73,11 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
@@ -55,147 +60,138 @@
  TAO_NAMESPACE  Messaging
  {
    typedef CORBA::Short RebindMode;
-@@ -100,6 +116,9 @@
+@@ -100,6 +120,9 @@
    
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort ORDER_DEADLINE;
    
 +#if (TAO_HAS_REBIND_POLICY == 1)
 +
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REBIND_POLICY_TYPE;
    
    
-@@ -249,6 +268,10 @@
+@@ -249,6 +272,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RebindPolicy;
    
 +#endif /* TAO_HAS_REBIND_POLICY == 1 */
 +
 +#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SYNC_SCOPE_POLICY_TYPE;
    
    
-@@ -398,6 +421,10 @@
+@@ -398,6 +425,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SyncScopePolicy;
    
 +#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 +
 +#if (TAO_HAS_PRIORITY_POLICIES == 1)
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PRIORITY_POLICY_TYPE;
    
    struct PriorityRange;
-@@ -749,6 +776,10 @@
+@@ -749,6 +780,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyPriorityPolicy;
    
 +#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */
 +
 +#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1)
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_START_TIME_POLICY_TYPE;
    
    
-@@ -898,6 +929,10 @@
+@@ -898,6 +933,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestStartTimePolicy;
    
 +#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */
 +
 +#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1)
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_END_TIME_POLICY_TYPE;
    
    
-@@ -1047,6 +1082,10 @@
+@@ -1047,6 +1086,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestEndTimePolicy;
    
 +#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */
 +
 +#if (TAO_HAS_REPLY_START_TIME_POLICY == 1)
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_START_TIME_POLICY_TYPE;
    
    
-@@ -1196,6 +1235,10 @@
+@@ -1196,6 +1239,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyStartTimePolicy;
    
 +#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */
 +
 +#if (TAO_HAS_REPLY_END_TIME_POLICY == 1)
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_END_TIME_POLICY_TYPE;
    
    
-@@ -1345,6 +1388,10 @@
+@@ -1345,6 +1392,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyEndTimePolicy;
    
 +#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */
 +
 +#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1)
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_REQ_TIMEOUT_POLICY_TYPE;
    
    
-@@ -1494,6 +1541,10 @@
+@@ -1494,6 +1545,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RelativeRequestTimeoutPolicy;
    
 +#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */
 +
 +#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_RT_TIMEOUT_POLICY_TYPE;
    
    
-@@ -1643,6 +1694,10 @@
+@@ -1643,6 +1698,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RelativeRoundtripTimeoutPolicy;
    
 +#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 +
 +#if (TAO_HAS_ROUTING_POLICY == 1)
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ROUTING_POLICY_TYPE;
    
    struct RoutingTypeRange;
-@@ -1845,6 +1900,10 @@
+@@ -1845,6 +1904,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RoutingPolicy;
    
 +#endif /* TAO_HAS_ROUTING_POLICY == 1 */
 +
 +#if (TAO_HAS_MAX_HOPS_POLICY == 1)
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong MAX_HOPS_POLICY_TYPE;
    
    
-@@ -1994,6 +2053,10 @@
+@@ -1994,6 +2057,10 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MaxHopsPolicy;
    
 +#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */
 +
 +
-+  
++
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong QUEUE_ORDER_POLICY_TYPE;
    
    
-@@ -2006,6 +2069,8 @@
- #endif /* end #if !defined */
-   
-   
-+  
-+  
- #if !defined (_MESSAGING_QUEUEORDERPOLICY___VAR_CH_)
- #define _MESSAGING_QUEUEORDERPOLICY___VAR_CH_
-   
-@@ -2143,6 +2208,8 @@
+@@ -2143,6 +2212,8 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_QueueOrderPolicy;
    
@@ -204,7 +200,7 @@
    // Valuetype class
    class ExceptionHolder;
    
-@@ -2610,6 +2677,7 @@
+@@ -2610,6 +2681,7 @@
    
    TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyHandler;
    
@@ -212,7 +208,7 @@
    
  }
  TAO_NAMESPACE_CLOSE // module Messaging
-@@ -2614,14 +2682,20 @@
+@@ -2614,14 +2686,20 @@
  }
  TAO_NAMESPACE_CLOSE // module Messaging
  
@@ -233,7 +229,7 @@
  TAO_NAMESPACE  OBV_Messaging
  {
  
-@@ -2675,42 +2749,91 @@
+@@ -2675,42 +2753,91 @@
  TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_ptr); // copying
  TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_ptr *); // non-copying
  TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::SyncScopePolicy_ptr &);
@@ -325,7 +321,7 @@
  TAO_Messaging_Export void operator<<= (CORBA::Any &, const Messaging::RoutingTypeRange &); // copying version
  TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RoutingTypeRange*); // noncopying version
  TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RoutingTypeRange *&); // deprecated
-@@ -2719,14 +2843,29 @@
+@@ -2719,14 +2847,29 @@
  TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RoutingPolicy_ptr); // copying
  TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RoutingPolicy_ptr *); // non-copying
  TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RoutingPolicy_ptr &);
@@ -355,7 +351,7 @@
  // Any operators for valuetype Messaging::ExceptionHolder
  TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ExceptionHolder *); // copying
  TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ExceptionHolder **); // non-copying
-@@ -2736,12 +2876,26 @@
+@@ -2736,12 +2880,26 @@
  TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr *); // non-copying
  TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyHandler_ptr &);
  
@@ -382,7 +378,7 @@
  //@@ Boris: begin experimental
  TAO_NAMESPACE CORBA
  {
-@@ -2750,6 +2904,8 @@
+@@ -2750,6 +2908,8 @@
  }
  TAO_NAMESPACE_CLOSE
  //@@ Boris: end experimental
@@ -391,7 +387,7 @@
  
  TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *);
  TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&);
-@@ -2757,6 +2913,7 @@
+@@ -2757,6 +2917,7 @@
  #if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_
  #define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_
  
@@ -399,7 +395,7 @@
  TAO_Messaging_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
      const Messaging::ExceptionHolder::_tao_seq_Octet &
-@@ -2765,12 +2922,14 @@
+@@ -2765,12 +2926,14 @@
      TAO_InputCDR &,
      Messaging::ExceptionHolder::_tao_seq_Octet &
    );
@@ -414,8 +410,8 @@
  #endif /* __ACE_INLINE__ */
  
  
---- orig/MessagingC.i	Wed Mar  6 15:04:36 2002
-+++ MessagingC.i	Mon Mar  4 15:38:07 2002
+--- orig/MessagingC.i	Mon Mar 18 17:42:36 2002
++++ MessagingC.i	Wed Mar  6 16:04:57 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -519,8 +515,8 @@
  
 +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 +#endif /*__ACE_INLINE__*/
---- orig/MessagingC.cpp	Wed Mar  6 15:04:36 2002
-+++ MessagingC.cpp	Wed Mar  6 15:08:08 2002
+--- orig/MessagingC.cpp	Mon Mar 18 17:42:36 2002
++++ MessagingC.cpp	Mon Mar 18 17:34:37 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -529,6 +525,15 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,7 +19,7 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#include "MessagingC.h"
++#include "Messaging.h"
+ 
+ #include "tao/Stub.h"
+ #include "tao/Invocation.h"
 @@ -266,6 +266,8 @@
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_DEADLINE, 8U)
@@ -1355,8 +1360,8 @@
 +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 +
  
---- orig/MessagingS.h	Wed Mar  6 15:04:36 2002
-+++ MessagingS.h	Wed Mar  6 15:01:05 2002
+--- orig/MessagingS.h	Mon Mar 18 17:42:36 2002
++++ MessagingS.h	Mon Mar 18 17:34:37 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -1376,7 +1381,7 @@
 -#include "MessagingC.h"
  
 +#include "messaging_export.h"
-+#include "MessagingC.h"
++#include "Messaging.h"
 +#include "tao/PortableServer/PolicyS.h"
 +#include "tao/TimeBaseS.h"
 +#include "tao/Messaging_SyncScopeC.h"
@@ -1413,8 +1418,8 @@
  
  }
  TAO_NAMESPACE_CLOSE // module Messaging
---- orig/MessagingS.i	Wed Mar  6 15:04:36 2002
-+++ MessagingS.i	Fri Mar  1 11:43:03 2002
+--- orig/MessagingS.i	Mon Mar 18 17:42:36 2002
++++ MessagingS.i	Wed Mar  6 16:04:58 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -1423,8 +1428,8 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
---- orig/MessagingS.cpp	Wed Mar  6 15:04:36 2002
-+++ MessagingS.cpp	Mon Mar  4 15:38:07 2002
+--- orig/MessagingS.cpp	Mon Mar 18 17:42:37 2002
++++ MessagingS.cpp	Wed Mar  6 16:04:58 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -1446,7 +1451,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:04:36 */
+-/* starting time is 17:42:37 */
 +/* starting time is 13:40:33 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: /project/balar/jai/ace/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup  */
@@ -1455,7 +1460,7 @@
      }
    return 0;
  }
--/* ending time is 15:04:36 */
+-/* ending time is 17:42:37 */
 +/* ending time is 13:40:33 */
  static TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable tao_Messaging_ReplyHandler_optable;
  
@@ -1496,8 +1501,8 @@
 +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
  
  #endif /* ifndef */
---- orig/MessagingS_T.h	Wed Mar  6 15:04:36 2002
-+++ MessagingS_T.h	Mon Mar  4 15:38:07 2002
+--- orig/MessagingS_T.h	Mon Mar 18 17:42:37 2002
++++ MessagingS_T.h	Wed Mar  6 16:04:58 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -1523,8 +1528,8 @@
  
  }
  TAO_NAMESPACE_CLOSE // module Messaging
---- orig/MessagingS_T.i	Wed Mar  6 15:04:36 2002
-+++ MessagingS_T.i	Mon Mar  4 15:38:07 2002
+--- orig/MessagingS_T.i	Mon Mar 18 17:42:36 2002
++++ MessagingS_T.i	Wed Mar  6 16:04:58 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -1550,8 +1555,8 @@
 +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
  #endif /* ACE_HAS_USING_KEYWORD */
  
---- orig/MessagingS_T.cpp	Wed Mar  6 15:04:36 2002
-+++ MessagingS_T.cpp	Fri Mar  1 11:43:04 2002
+--- orig/MessagingS_T.cpp	Mon Mar 18 17:42:37 2002
++++ MessagingS_T.cpp	Wed Mar  6 16:04:58 2002
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //