diff options
Diffstat (limited to 'TAO/tao/diffs/PortableInterceptor.diff')
| -rw-r--r-- | TAO/tao/diffs/PortableInterceptor.diff | 70 |
1 files changed, 13 insertions, 57 deletions
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. |