diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-04-02 02:12:10 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-04-02 02:12:10 +0000 |
| commit | 31f063a7465588d30aee71a703c9b0d82770d743 (patch) | |
| tree | fd791d488403bf9e84d2d2db77fc251bff38e4ac /TAO/tao/diffs | |
| parent | b913fd09907036e53d9b875a4375a31cef69e319 (diff) | |
| download | ATCD-31f063a7465588d30aee71a703c9b0d82770d743.tar.gz | |
ChangeLogTag:Sun Apr 1 18:59:48 2001 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/tao/diffs')
| -rw-r--r-- | TAO/tao/diffs/MessagingC.h.diff | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/TAO/tao/diffs/MessagingC.h.diff b/TAO/tao/diffs/MessagingC.h.diff index 10d6738268d..f7fd4fb1f61 100644 --- a/TAO/tao/diffs/MessagingC.h.diff +++ b/TAO/tao/diffs/MessagingC.h.diff @@ -1,5 +1,13 @@ --- orig/MessagingC.h Sat Mar 31 14:51:18 2001 -+++ MessagingC.h Sat Mar 31 14:51:49 2001 ++++ MessagingC.h Sun Apr 1 18:57:27 2001 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ + + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: @@ -23,13 +23,25 @@ #define _TAO_IDL_ORIG_MESSAGINGC_H_ @@ -1966,18 +1974,30 @@ #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ -@@ -2713,7 +2812,9 @@ +@@ -2713,26 +2812,15 @@ #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *); // +-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&); +- +-#if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ +-#define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ +- +-TAO_Export CORBA::Boolean operator<< ( +- TAO_OutputCDR &, +- const Messaging::ExceptionHolder::_tao_seq_Octet & +- ); +-TAO_Export CORBA::Boolean operator>> ( +- TAO_InputCDR &, +- Messaging::ExceptionHolder::_tao_seq_Octet & +- ); +- +-#endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ */ +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) -+ -+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *); // - TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&); - #if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_H_ -@@ -2733,6 +2834,8 @@ ++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *); // ++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &); @@ -1986,7 +2006,7 @@ #endif /* __ACE_INLINE__ */ -@@ -2743,6 +2846,8 @@ +@@ -2743,6 +2831,8 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ |