diff options
| -rw-r--r-- | TAO/tao/Messaging_PolicyValue.pidl | 2 | ||||
| -rw-r--r-- | TAO/tao/Messaging_PolicyValueA.cpp | 11 | ||||
| -rw-r--r-- | TAO/tao/Messaging_PolicyValueA.h | 55 | ||||
| -rw-r--r-- | TAO/tao/Messaging_PolicyValueC.cpp | 39 | ||||
| -rw-r--r-- | TAO/tao/Messaging_PolicyValueC.h | 53 | ||||
| -rw-r--r-- | TAO/tao/Messaging_PolicyValueC.i | 43 | ||||
| -rw-r--r-- | TAO/tao/Messaging_SyncScope.pidl | 2 | ||||
| -rw-r--r-- | TAO/tao/Messaging_SyncScopeC.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/Messaging_SyncScopeC.h | 34 | ||||
| -rw-r--r-- | TAO/tao/Object_Key.pidl | 10 | ||||
| -rw-r--r-- | TAO/tao/Object_KeyC.cpp | 52 | ||||
| -rw-r--r-- | TAO/tao/Object_KeyC.h | 26 | ||||
| -rw-r--r-- | TAO/tao/Object_KeyC.i | 18 |
13 files changed, 132 insertions, 218 deletions
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl index df71b495d7f..c52bf4637c4 100644 --- a/TAO/tao/Messaging_PolicyValue.pidl +++ b/TAO/tao/Messaging_PolicyValue.pidl @@ -9,7 +9,7 @@ * The command used to generate code from this file is: * * tao_idl.exe - * -o orig -Ge 1 -GT -GA + * -o orig -Ge 1 -GT -GA -Sc * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp index 5695a6e58f0..ac8007ad599 100644 --- a/TAO/tao/Messaging_PolicyValueA.cpp +++ b/TAO/tao/Messaging_PolicyValueA.cpp @@ -26,12 +26,11 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "Messaging_PolicyValueC.h" -#include "Messaging_PolicyValueA.h" #include "tao/Typecode.h" #include "tao/Any_Dual_Impl_T.h" -// TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// TAO_IDL - Generated from +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -88,8 +87,8 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -172,5 +171,5 @@ CORBA::Boolean operator>>= ( Messaging::PolicyValueSeq \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Messaging_PolicyValueA.h b/TAO/tao/Messaging_PolicyValueA.h deleted file mode 100644 index 39be5b880f5..00000000000 --- a/TAO/tao/Messaging_PolicyValueA.h +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be/be_codegen.cpp:848 - -#ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEA_ANYOP_H_ -#define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEA_ANYOP_H_ - -#include /**/ "ace/pre.h" - -// TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version -TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValue *&); - -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); // copying version -TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValueSeq *&); - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index 53da0e34f2a..2d62e8b245e 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:338 +// be\be_codegen.cpp:323 #include "Messaging_PolicyValueC.h" @@ -41,7 +41,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:62 +// be\be_visitor_arg_traits.cpp:64 // Arg traits specializations. namespace TAO @@ -50,7 +50,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:284 +// be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_Messaging_PolicyValue[] = { @@ -138,7 +138,7 @@ namespace Messaging } // TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:66 void Messaging::PolicyValue::_tao_any_destructor ( @@ -151,7 +151,7 @@ Messaging::PolicyValue::_tao_any_destructor ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_MESSAGING_POLICYVALUESEQ_CS_) #define _MESSAGING_POLICYVALUESEQ_CS_ @@ -204,7 +204,7 @@ void Messaging::PolicyValueSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:284 +// be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_Messaging_PolicyValueSeq[] = { @@ -318,7 +318,30 @@ namespace Messaging } // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:95 +// be\be_visitor_structure/cdr_op_cs.cpp:61 + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const Messaging::PolicyValue &_tao_aggregate + ) +{ + return + (strm << _tao_aggregate.ptype) && + (strm << _tao_aggregate.pvalue); +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + Messaging::PolicyValue &_tao_aggregate + ) +{ + return + (strm >> _tao_aggregate.ptype) && + (strm >> _tao_aggregate.pvalue); +} + +// TAO_IDL - Generated from +// be\be_visitor_sequence/cdr_op_cs.cpp:96 #if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ #define _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ @@ -390,7 +413,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */ // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1725 +// be\be_visitor_root/root.cpp:1633 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index 69711f2d19a..3554e901c14 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.h @@ -26,19 +26,21 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:186 +// be\be_codegen.cpp:171 #ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_ #define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_ #include /**/ "ace/pre.h" -#include "IOP_IORC.h" +#include "tao/IOP_IORC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/TAO_Export.h" + #include "tao/PolicyC.h" #if defined (TAO_EXPORT_MACRO) @@ -65,13 +67,13 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:48 +// be\be_visitor_module/module_ch.cpp:48 namespace Messaging { // TAO_IDL - Generated from - // be/be_type.cpp:258 + // be\be_type.cpp:258 struct PolicyValue; @@ -89,7 +91,7 @@ namespace Messaging PolicyValue_out; // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 + // be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export PolicyValue { @@ -101,12 +103,12 @@ namespace Messaging }; // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValue; // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:101 + // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_MESSAGING_POLICYVALUESEQ_CH_) #define _MESSAGING_POLICYVALUESEQ_CH_ @@ -154,27 +156,27 @@ namespace Messaging #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValueSeq; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const IOP::ComponentId TAG_POLICIES = 2U; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const IOP::ServiceId INVOCATION_POLICIES = 2U; // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:66 +// be\be_visitor_module/module_ch.cpp:66 } // module Messaging // TAO_IDL - Generated from -// be/be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -182,18 +184,29 @@ namespace TAO } // TAO_IDL - Generated from -// be/be_visitor_root/cdr_op.cpp:48 +// be\be_visitor_structure/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version +TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValue *&); + +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_ch.cpp:52 -#ifndef __ACE_INLINE__ +TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValueSeq *&); // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ch.cpp:53 +// be\be_visitor_structure/cdr_op_ch.cpp:54 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue &); // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_ch.cpp:70 +// be\be_visitor_sequence/cdr_op_ch.cpp:71 #if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ #define _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ @@ -210,12 +223,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */ // TAO_IDL - Generated from -// be/be_visitor_root/cdr_op.cpp:64 - -#endif /* __ACE_INLINE__ */ - -// TAO_IDL - Generated from -// be/be_codegen.cpp:1050 +// be\be_codegen.cpp:978 #if defined (__ACE_INLINE__) #include "Messaging_PolicyValueC.i" @@ -232,3 +240,4 @@ TAO_Export CORBA::Boolean operator>> ( #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/Messaging_PolicyValueC.i b/TAO/tao/Messaging_PolicyValueC.i index 14915ad4a96..38aa32569ba 100644 --- a/TAO/tao/Messaging_PolicyValueC.i +++ b/TAO/tao/Messaging_PolicyValueC.i @@ -26,46 +26,3 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ci.cpp:70 - -ACE_INLINE -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const Messaging::PolicyValue &_tao_aggregate - ) -{ - return - (strm << _tao_aggregate.ptype) && - (strm << _tao_aggregate.pvalue); -} - -ACE_INLINE -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - Messaging::PolicyValue &_tao_aggregate - ) -{ - return - (strm >> _tao_aggregate.ptype) && - (strm >> _tao_aggregate.pvalue); -} - -// TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_ci.cpp:81 - -#if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_I_ -#define _TAO_CDR_OP_Messaging_PolicyValueSeq_I_ - -CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const Messaging::PolicyValueSeq & - ); - -CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - Messaging::PolicyValueSeq & - ); - -#endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_I_ */ - diff --git a/TAO/tao/Messaging_SyncScope.pidl b/TAO/tao/Messaging_SyncScope.pidl index 58be455a99e..8970534ce6d 100644 --- a/TAO/tao/Messaging_SyncScope.pidl +++ b/TAO/tao/Messaging_SyncScope.pidl @@ -9,7 +9,7 @@ * The command used to generate code from this file is: * * tao_idl.exe - * -o orig -St + * -o orig -St -Sc * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/corbafwd.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp index 17acb66b4ca..5c71c07145c 100644 --- a/TAO/tao/Messaging_SyncScopeC.cpp +++ b/TAO/tao/Messaging_SyncScopeC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 +// be\be_codegen.cpp:323 #include "Messaging_SyncScopeC.h" @@ -40,10 +40,11 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 +// be\be_visitor_arg_traits.cpp:64 // Arg traits specializations. namespace TAO { } + diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h index eb0123f13c2..0bcbe8d2f24 100644 --- a/TAO/tao/Messaging_SyncScopeC.h +++ b/TAO/tao/Messaging_SyncScopeC.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151 +// be\be_codegen.cpp:171 #ifndef _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_ #define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_ @@ -39,6 +39,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/TAO_Export.h" + #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif @@ -63,44 +65,44 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +// be\be_visitor_module/module_ch.cpp:48 namespace Messaging { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 + // be\be_visitor_typedef/typedef_ch.cpp:342 typedef CORBA::Short SyncScope; typedef CORBA::Short_out SyncScope_out; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const Messaging::SyncScope SYNC_NONE = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const Messaging::SyncScope SYNC_WITH_TRANSPORT = 1; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const Messaging::SyncScope SYNC_WITH_SERVER = 2; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const Messaging::SyncScope SYNC_WITH_TARGET = 3; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 +// be\be_visitor_module/module_ch.cpp:66 } // module Messaging // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 +// be\be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -108,17 +110,7 @@ namespace TAO } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 - -#ifndef __ACE_INLINE__ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 - -#endif /* __ACE_INLINE__ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 +// be\be_codegen.cpp:978 #if defined (__ACE_INLINE__) #include "Messaging_SyncScopeC.i" @@ -133,4 +125,6 @@ namespace TAO #endif /* __BORLANDC__ */ #include /**/ "ace/post.h" + #endif /* ifndef */ + diff --git a/TAO/tao/Object_Key.pidl b/TAO/tao/Object_Key.pidl index 742d7aaabf8..acd5610ea25 100644 --- a/TAO/tao/Object_Key.pidl +++ b/TAO/tao/Object_Key.pidl @@ -2,6 +2,16 @@ // TAO specific IDL definition of an octet sequence that we use to represent // Object keys inside the POA. +// This file was used to generate the code in Object_KeyC.* +// The command used to generate code is: +// +// tao_idl +// -o orig -Ge 1 -St -GT -Gp -Gd -Sc +// -Wb,export_macro=TAO_Export +// -Wb,pre_include="ace/pre.h" +// -Wb,post_include="ace/post.h" +// Object_Key.pidl +// module TAO { diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 5d213e326e5..3f441a3ae8c 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -26,11 +26,11 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 +// be\be_codegen.cpp:323 #include "Object_KeyC.h" -#include "ORB_Core.h" +#include "tao/ORB_Core.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -41,15 +41,16 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 +// be\be_visitor_arg_traits.cpp:64 // Arg traits specializations. namespace TAO { } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 + +// TAO_IDL - Generated from +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_TAO_OBJECTKEY_CS_) #define _TAO_OBJECTKEY_CS_ @@ -237,7 +238,7 @@ TAO::ObjectKey::demarshal_key (TAO::ObjectKey &key, #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 +// be\be_visitor_sequence/cdr_op_cs.cpp:96 #if !defined _TAO_CDR_OP_TAO_ObjectKey_CPP_ #define _TAO_CDR_OP_TAO_ObjectKey_CPP_ @@ -248,27 +249,27 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (TAO::ObjectKey *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } - + return 0; } @@ -278,28 +279,28 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence // to make sure it does not exceed the length // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) + if (_tao_seq_len > strm.length ()) { return 0; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (ACE_BIT_DISABLED (strm.start ()->flags (), ACE_Message_Block::DONT_DELETE)) @@ -309,7 +310,7 @@ CORBA::Boolean operator>> ( strm.orb_core ()->resource_factory ()-> input_cdr_allocator_type_locked () == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); @@ -320,18 +321,18 @@ CORBA::Boolean operator>> ( return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - + } - + return 0; } #endif /* _TAO_CDR_OP_TAO_ObjectKey_CPP_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 +// be\be_visitor_root/root.cpp:1633 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -375,4 +376,5 @@ CORBA::Boolean operator>> ( CORBA::Octet \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index c4e82c18c5c..8c048d7682c 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151 +// be\be_codegen.cpp:171 #ifndef _TAO_IDL_ORIG_OBJECT_KEYC_H_ #define _TAO_IDL_ORIG_OBJECT_KEYC_H_ @@ -67,13 +67,13 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +// be\be_visitor_module/module_ch.cpp:48 namespace TAO { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 + // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_TAO_OBJECTKEY_CH_) #define _TAO_OBJECTKEY_CH_ @@ -146,12 +146,12 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 +// be\be_visitor_module/module_ch.cpp:66 } // module TAO // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 +// be\be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -159,12 +159,7 @@ namespace TAO } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 - -#ifndef __ACE_INLINE__ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 +// be\be_visitor_sequence/cdr_op_ch.cpp:71 #if !defined _TAO_CDR_OP_TAO_ObjectKey_H_ #define _TAO_CDR_OP_TAO_ObjectKey_H_ @@ -181,12 +176,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_ObjectKey_H_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 - -#endif /* __ACE_INLINE__ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 +// be\be_codegen.cpp:978 #if defined (__ACE_INLINE__) #include "Object_KeyC.i" @@ -201,4 +191,6 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __BORLANDC__ */ #include /**/ "ace/post.h" + #endif /* ifndef */ + diff --git a/TAO/tao/Object_KeyC.i b/TAO/tao/Object_KeyC.i index 74b18b2e74c..38aa32569ba 100644 --- a/TAO/tao/Object_KeyC.i +++ b/TAO/tao/Object_KeyC.i @@ -26,21 +26,3 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 - -#if !defined _TAO_CDR_OP_TAO_ObjectKey_I_ -#define _TAO_CDR_OP_TAO_ObjectKey_I_ - -CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const TAO::ObjectKey & - ); - -CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - TAO::ObjectKey & - ); - -#endif /* _TAO_CDR_OP_TAO_ObjectKey_I_ */ - |