diff options
Diffstat (limited to 'TAO/tao')
-rw-r--r-- | TAO/tao/PI/diff/PolicyFactory.diff | 4 | ||||
-rw-r--r-- | TAO/tao/PortableServer/diffs/PS_Forward.diff | 14 |
2 files changed, 6 insertions, 12 deletions
diff --git a/TAO/tao/PI/diff/PolicyFactory.diff b/TAO/tao/PI/diff/PolicyFactory.diff index c91fa7f65da..f05dda1497b 100644 --- a/TAO/tao/PI/diff/PolicyFactory.diff +++ b/TAO/tao/PI/diff/PolicyFactory.diff @@ -3,8 +3,6 @@ @@ -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: @@ -109,8 +107,6 @@ @@ -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: diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff index db64ebb520b..c7fab42e6fa 100644 --- a/TAO/tao/PortableServer/diffs/PS_Forward.diff +++ b/TAO/tao/PortableServer/diffs/PS_Forward.diff @@ -3,15 +3,13 @@ @@ -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: @@ -61,11 +61,24 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ - + +class TAO_ServantBase; +class TAO_ServantBase_var; +class TAO_Local_ServantBase; @@ -20,7 +18,7 @@ + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 - + namespace PortableServer { + typedef TAO_ServantBase ServantBase; @@ -30,7 +28,7 @@ + + typedef TAO_Local_ServantBase LocalServantBase; + typedef TAO_DynamicImplementation DynamicImplementation; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:472 @@ -113,27 +126,6 @@ @@ -40,7 +38,7 @@ - -#if !defined (_PORTABLESERVER_POA__TRAITS_CH_) -#define _PORTABLESERVER_POA__TRAITS_CH_ -- +- - template<> - struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA> - { @@ -59,5 +57,5 @@ - -#endif /* end #if !defined */ } - + // TAO_IDL - Generated from |