ChangeLogTag: Wed Sep 4 13:59:14 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu>

2 files changed, 106 insertions, 16 deletions

diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index b64424fdc6c..dbd66db6e8c 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -645,7 +645,6 @@ TAO_NAMESPACE  OBV_Messaging
   private:
     CORBA::Boolean _pd_is_system_exception;
     CORBA::Boolean _pd_byte_order;
-    typedef _tao_seq_Octet _marshaled_exception_seq;
     _tao_seq_Octet _pd_marshaled_exception;
   };
 
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff
index 92643a6ff8a..b042c3d3b10 100644
--- a/TAO/tao/Messaging/diffs/Messaging.diff
+++ b/TAO/tao/Messaging/diffs/Messaging.diff
@@ -1,6 +1,14 @@
---- orig/MessagingC.h	Tue Sep  3 16:30:43 2002
-+++ MessagingC.h	Tue Sep  3 16:15:16 2002
-@@ -26,8 +26,12 @@
+--- orig/MessagingC.h	Wed Sep  4 13:22:26 2002
++++ MessagingC.h	Wed Sep  4 13:50:51 2002
+@@ -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:
+@@ -26,14 +26,23 @@
  #ifndef _TAO_IDL_ORIG_MESSAGINGC_H_
  #define _TAO_IDL_ORIG_MESSAGINGC_H_
  
@@ -14,17 +22,45 @@
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
-@@ -37,6 +41,8 @@
- #include "Messaging_SyncScope_PolicyC.h"
- #include "Messaging_RT_PolicyC.h"
- #include "Messaging_No_ImplC.h"
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+ #include "messaging_export.h"
++#include "Messaging_SyncScope_PolicyC.h"
++#include "Messaging_RT_PolicyC.h"
++#include "Messaging_No_ImplC.h"
 +#include "tao/ValueBase.h"
 +#include "tao/ValueFactory.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
---- orig/MessagingC.cpp	Tue Sep  3 16:30:43 2002
-+++ MessagingC.cpp	Tue Sep  3 16:19:50 2002
+@@ -636,7 +645,6 @@
+   private:
+     CORBA::Boolean _pd_is_system_exception;
+     CORBA::Boolean _pd_byte_order;
+-    typedef _tao_seq_Octet _marshaled_exception_seq;
+     _tao_seq_Octet _pd_marshaled_exception;
+   };
+   
+--- orig/MessagingC.i	Wed Sep  4 13:22:26 2002
++++ MessagingC.i	Tue Sep  3 17:22:49 2002
+@@ -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:
+--- orig/MessagingC.cpp	Wed Sep  4 13:22:26 2002
++++ MessagingC.cpp	Tue Sep  3 17:22:49 2002
+@@ -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,7 +23,7 @@
  // TAO_IDL - Generated from
  // be/be_codegen.cpp:315
@@ -34,17 +70,72 @@
  
  #include "tao/Stub.h"
  #include "tao/Invocation.h"
---- orig/MessagingS.h	Tue Sep  3 16:30:43 2002
-+++ MessagingS.h	Tue Sep  3 16:21:38 2002
-@@ -27,10 +27,7 @@
+--- orig/MessagingS.h	Wed Sep  4 13:22:26 2002
++++ MessagingS.h	Tue Sep  3 17:22:49 2002
+@@ -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:
+@@ -27,7 +27,7 @@
  #define _TAO_IDL_ORIG_MESSAGINGS_H_
  
  #include "ace/pre.h"
--#include "Messaging_SyncScope_PolicyS.h"
--#include "Messaging_RT_PolicyS.h"
--#include "Messaging_No_ImplS.h"
 -#include "MessagingC.h"
 +#include "Messaging.h"
  
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
+--- orig/MessagingS.i	Wed Sep  4 13:22:26 2002
++++ MessagingS.i	Tue Sep  3 17:22:49 2002
+@@ -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:
+--- orig/MessagingS.cpp	Wed Sep  4 13:22:26 2002
++++ MessagingS.cpp	Tue Sep  3 17:22:49 2002
+@@ -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:
+--- orig/MessagingS_T.h	Wed Sep  4 13:22:26 2002
++++ MessagingS_T.h	Tue Sep  3 17:22:49 2002
+@@ -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:
+--- orig/MessagingS_T.i	Wed Sep  4 13:22:26 2002
++++ MessagingS_T.i	Tue Sep  3 17:22:49 2002
+@@ -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:
+--- orig/MessagingS_T.cpp	Wed Sep  4 13:22:26 2002
++++ MessagingS_T.cpp	Tue Sep  3 17:22:49 2002
+@@ -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: