ChangeLogTag: Fri Feb 18 10:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 92 insertions, 126 deletions

diff --git a/TAO/tao/diffs/Domain.diff b/TAO/tao/diffs/Domain.diff
index dc9c0df787f..cfaf7f47b07 100644
--- a/TAO/tao/diffs/Domain.diff
+++ b/TAO/tao/diffs/Domain.diff
@@ -1,5 +1,63 @@
---- orig/DomainC.h	2005-02-11 12:21:05.659990400 +0100
-+++ DomainC.h	2005-02-11 12:58:02.918251200 +0100
+--- orig/DomainC.cpp	2005-02-18 11:42:40.695684800 +0100
++++ DomainC.cpp	2005-02-18 12:07:00.775176000 +0100
+@@ -39,6 +39,10 @@
+ #include "tao/Special_Basic_Arguments.h"
+ #include "ace/OS_NS_string.h"
+ 
++#include "tao/ORB_Core.h"
++#include "tao/IFR_Client_Adapter.h"
++#include "ace/Dynamic_Service.h"
++
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+ #endif /* __BORLANDC__ */
+@@ -50,6 +54,44 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:66
+ 
++// TAO specific stuff.
++namespace CORBA
++{
++  class InterfaceDef;
++  typedef InterfaceDef *InterfaceDef_ptr;
++  typedef TAO_Objref_Var_T<InterfaceDef> InterfaceDef_var;
++  typedef TAO_Objref_Out_T<InterfaceDef> InterfaceDef_out;
++}
++
++#if TAO_HAS_INTERCEPTORS == 1
++
++ACE_TEMPLATE_SPECIALIZATION
++void
++TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p)
++{
++  TAO_IFR_Client_Adapter *adapter =
++    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
++        TAO_ORB_Core::ifr_client_adapter_name ()
++      );
++
++  adapter->interfacedef_any_insert (p.argument, this->x_);
++  p.mode = CORBA::PARAM_IN;
++}
++
++#endif /* TAO_HAS_INTERCEPTORS */
++
++ACE_TEMPLATE_SPECIALIZATION
++CORBA::Boolean
++TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr)
++{
++  TAO_IFR_Client_Adapter *adapter =
++    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
++        TAO_ORB_Core::ifr_client_adapter_name ()
++      );
++
++  return adapter->interfacedef_cdr_insert (cdr, this->x_);
++}
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+--- orig/DomainC.h	2005-02-18 11:42:40.695684800 +0100
++++ DomainC.h	2005-02-18 11:42:54.145024000 +0100
 @@ -51,7 +51,6 @@
  #include "tao/Seq_Out_T.h"
  
diff --git a/TAO/tao/diffs/Object_Key.diff b/TAO/tao/diffs/Object_Key.diff
index 608b5afb5a2..f452821df06 100644
--- a/TAO/tao/diffs/Object_Key.diff
+++ b/TAO/tao/diffs/Object_Key.diff
@@ -1,13 +1,5 @@
---- orig/Object_KeyC.cpp	2005-02-16 21:43:09.756739200 +0100
-+++ Object_KeyC.cpp	2005-02-16 21:45:11.431699200 +0100
-@@ -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/Object_KeyC.cpp	2005-02-18 11:42:43.930336000 +0100
++++ Object_KeyC.cpp	2005-02-18 11:42:54.325283200 +0100
 @@ -41,6 +41,10 @@
  #include "Object_KeyC.inl"
  #endif /* !defined INLINE */
@@ -170,16 +162,8 @@
  #endif /* end #if !defined */
  
  // TAO_IDL - Generated from
---- orig/Object_KeyC.h	2005-02-16 21:43:09.756739200 +0100
-+++ Object_KeyC.h	2005-02-16 21:44:04.235075200 +0100
-@@ -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/Object_KeyC.h	2005-02-18 11:42:43.930336000 +0100
++++ Object_KeyC.h	2005-02-18 11:42:54.335297600 +0100
 @@ -124,6 +124,25 @@
        )
        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff
index 720a4a431c9..d309e2dfe43 100644
--- a/TAO/tao/diffs/OctetSeq.diff
+++ b/TAO/tao/diffs/OctetSeq.diff
@@ -1,5 +1,5 @@
---- orig/OctetSeqC.h	2004-11-24 10:45:07.787692800 +0100
-+++ OctetSeqC.h	2004-11-24 10:46:21.874224000 +0100
+--- orig/OctetSeqC.h	2005-02-18 11:42:33.865864000 +0100
++++ OctetSeqC.h	2005-02-18 11:42:54.205110400 +0100
 @@ -148,6 +148,18 @@
  {
  }
diff --git a/TAO/tao/diffs/Policy.diff b/TAO/tao/diffs/Policy.diff
index bffdb569967..f7605fb7de9 100644
--- a/TAO/tao/diffs/Policy.diff
+++ b/TAO/tao/diffs/Policy.diff
@@ -1,14 +1,6 @@
---- orig/PolicyC.h	2004-11-17 09:35:42.238198400 +0100
-+++ PolicyC.h	2004-11-17 09:35:50.159588800 +0100
-@@ -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:
-@@ -334,6 +334,15 @@
+--- orig/PolicyC.h	2005-02-18 11:42:38.843020800 +0100
++++ PolicyC.h	2005-02-18 11:42:53.904678400 +0100
+@@ -338,6 +338,15 @@
      
      virtual const char* _interface_repository_id (void) const;
      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
@@ -24,18 +16,10 @@
    private:
      TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
    
---- orig/PolicyC.cpp	2004-11-17 09:35:42.238198400 +0100
-+++ PolicyC.cpp	2004-11-17 09:55:41.000000000 +0100
-@@ -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:
-@@ -1118,6 +1118,34 @@
-     }
+--- orig/PolicyC.cpp	2005-02-18 11:42:38.843020800 +0100
++++ PolicyC.cpp	2005-02-18 11:42:53.924707200 +0100
+@@ -1076,6 +1076,34 @@
+   );
  }
  
 +// Hand crafted.
diff --git a/TAO/tao/diffs/Policy_Forward.diff b/TAO/tao/diffs/Policy_Forward.diff
index 1739675e21d..5d5c6df277f 100644
--- a/TAO/tao/diffs/Policy_Forward.diff
+++ b/TAO/tao/diffs/Policy_Forward.diff
@@ -1,13 +1,5 @@
---- orig/Policy_ForwardC.h	2004-11-24 14:19:29.301641600 +0100
-+++ Policy_ForwardC.h	2004-11-24 14:53:14.000000000 +0100
-@@ -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/Policy_ForwardC.h	2005-02-18 11:42:32.143387200 +0100
++++ Policy_ForwardC.h	2005-02-18 11:42:54.245168000 +0100
 @@ -41,7 +41,6 @@
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
diff --git a/TAO/tao/diffs/PortableInterceptor.diff b/TAO/tao/diffs/PortableInterceptor.diff
index 6da84cb45c0..d710ece0506 100644
--- a/TAO/tao/diffs/PortableInterceptor.diff
+++ b/TAO/tao/diffs/PortableInterceptor.diff
@@ -1,16 +1,8 @@
---- orig/PortableInterceptorC.h	2004-11-15 10:52:20.574179200 +0100
-+++ PortableInterceptorC.h	2004-11-16 13:47:29.964508800 +0100
-@@ -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:
-@@ -50,6 +50,12 @@
- 
- #include "tao/CurrentC.h"
+--- orig/PortableInterceptorC.h	2005-02-18 11:42:29.499585600 +0100
++++ PortableInterceptorC.h	2005-02-18 11:42:53.794520000 +0100
+@@ -57,6 +57,12 @@
+ #include "tao/orb_typesC.h"
+ #include "tao/PolicyC.h"
  
 +#include "PI_ForwardC.h"
 +#include "tao/Messaging_SyncScopeC.h"
@@ -21,7 +13,7 @@
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
  #endif
-@@ -71,6 +77,15 @@
+@@ -78,6 +84,15 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
@@ -35,9 +27,9 @@
 +}
 +
  // TAO_IDL - Generated from 
- // be\be_visitor_root/root_ch.cpp:63
+ // be\be_visitor_root/root_ch.cpp:62
  
-@@ -1315,17 +1330,19 @@
+@@ -1326,17 +1341,19 @@
      
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
@@ -60,7 +52,7 @@
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
      
-@@ -1472,6 +1489,16 @@
+@@ -1483,6 +1500,16 @@
      
      static void _tao_any_destructor (void *);
      
@@ -77,46 +69,10 @@
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
      
-@@ -2144,27 +2171,6 @@
- 
- #endif /* end #if !defined */
- 
--#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
--#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
--  
--  ACE_TEMPLATE_SPECIALIZATION
--  struct TAO_Export Objref_Traits< ::PortableInterceptor::IORInterceptor>
--  {
--    static ::PortableInterceptor::IORInterceptor_ptr duplicate (
--        ::PortableInterceptor::IORInterceptor_ptr
--      );
--    static void release (
--        ::PortableInterceptor::IORInterceptor_ptr
--      );
--    static ::PortableInterceptor::IORInterceptor_ptr nil (void);
--    static CORBA::Boolean marshal (
--        ::PortableInterceptor::IORInterceptor_ptr p,
--        TAO_OutputCDR & cdr
--      );
--  };
--
--#endif /* end #if !defined */
--
- #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
- #define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
-   
---- orig/PortableInterceptorC.cpp	2004-11-15 10:52:20.574179200 +0100
-+++ PortableInterceptorC.cpp	2004-11-15 10:57:37.000000000 +0100
-@@ -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:
-@@ -2015,6 +2015,18 @@
-   return 0;
+--- orig/PortableInterceptorC.cpp	2005-02-18 11:42:29.499585600 +0100
++++ PortableInterceptorC.cpp	2005-02-18 11:42:53.834577600 +0100
+@@ -1957,6 +1957,18 @@
+   return false;
  }
  
 +// Hand-crafted.
diff --git a/TAO/tao/diffs/Typecode_types.diff b/TAO/tao/diffs/Typecode_types.diff
index 43ee8a1e47c..680ac0833f7 100644
--- a/TAO/tao/diffs/Typecode_types.diff
+++ b/TAO/tao/diffs/Typecode_types.diff
@@ -1,5 +1,5 @@
---- orig/Typecode_typesC.h	2005-02-11 12:21:03.236505600 +0100
-+++ Typecode_typesC.h	2005-02-11 12:22:23.181460800 +0100
+--- orig/Typecode_typesC.h	2005-02-18 11:42:38.332286400 +0100
++++ Typecode_typesC.h	2005-02-18 11:42:54.004822400 +0100
 @@ -75,26 +75,6 @@
    // TAO_IDL - Generated from
    // be\be_interface.cpp:598
diff --git a/TAO/tao/diffs/UShortSeq.diff b/TAO/tao/diffs/UShortSeq.diff
index f10510e70c4..d8b43627b8d 100644
--- a/TAO/tao/diffs/UShortSeq.diff
+++ b/TAO/tao/diffs/UShortSeq.diff
@@ -1,13 +1,5 @@
---- orig/UShortSeqC.h	2004-11-17 09:35:38.102251200 +0100
-+++ UShortSeqC.h	2004-11-17 09:55:41.000000000 +0100
-@@ -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/UShortSeqC.h	2005-02-18 11:42:34.827246400 +0100
++++ UShortSeqC.h	2005-02-18 11:42:54.064908800 +0100
 @@ -140,6 +140,18 @@
  {
  }