diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-27 23:45:28 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-27 23:45:28 +0000 |
| commit | 70ad25bb55120639b756d697dc83773648dce314 (patch) | |
| tree | 007b043ac57c73f4c1966f8823723b8e5fbf6d6c | |
| parent | 4f7fe5fbb13938de8744643d898db5c3671009fe (diff) | |
| download | ATCD-70ad25bb55120639b756d697dc83773648dce314.tar.gz | |
ChangeLogTag: Tue Jan 27 17:41:38 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/tao/OctetSeqA.h | 24 | ||||
| -rw-r--r-- | TAO/tao/OctetSeqC.h | 13 |
3 files changed, 24 insertions, 24 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fc229e79c87..667bf57744d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Jan 27 17:41:38 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/OctetSeqA.h: + * tao/OctetSeqC.h: + + Moved the declaration of Any operators and type code from + OctetSeqA.h to OctetSeqC.h, so the operators can be seen + in generated code if CORBA::OctetSeq is used there. Thanks + to Jeff Mirwaisi <jeff_mirwaisi@yahoo.com> for reporting + the bug and for sending in an example IDL file. + Mon Jan 26 17:46:18 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_operation/ami_cs.cpp: diff --git a/TAO/tao/OctetSeqA.h b/TAO/tao/OctetSeqA.h index e2840897e58..887ef8a15c9 100644 --- a/TAO/tao/OctetSeqA.h +++ b/TAO/tao/OctetSeqA.h @@ -33,30 +33,6 @@ #include /**/ "ace/pre.h" -#include "tao/orbconf.h" - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO TAO_Export - -//======= Handcrafted -namespace CORBA -{ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq; -} - -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version -TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h index a55bee4933d..e03e701b0e2 100644 --- a/TAO/tao/OctetSeqC.h +++ b/TAO/tao/OctetSeqC.h @@ -128,6 +128,11 @@ namespace CORBA #endif /* end #if !defined */ + // TAO_IDL - Generated from + // be/be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq; + // TAO_IDL - Generated from // be/be_visitor_module/module_ch.cpp:66 @@ -142,6 +147,14 @@ namespace TAO } // TAO_IDL - Generated from +// be/be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); + +// TAO_IDL - Generated from // be/be_visitor_root/cdr_op.cpp:48 #ifndef __ACE_INLINE__ |