diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2006-05-16 22:44:35 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2006-05-16 22:44:35 +0000 |
| commit | 8555af364564a56ac236370a180d4755dda9e1ba (patch) | |
| tree | 51258c739b26ccb0b21057e6a2d84f1b0acbadd9 /TAO/tao/diffs | |
| parent | 1d60fc04c8e6250a4ec3771ec995877289792461 (diff) | |
| download | ATCD-8555af364564a56ac236370a180d4755dda9e1ba.tar.gz | |
ChangeLog tag: Tue May 16 19:08:49 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
Diffstat (limited to 'TAO/tao/diffs')
| -rw-r--r-- | TAO/tao/diffs/OctetSeq.diff | 57 |
1 files changed, 52 insertions, 5 deletions
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff index cbdbb910426..4c917ccfaa0 100644 --- a/TAO/tao/diffs/OctetSeq.diff +++ b/TAO/tao/diffs/OctetSeq.diff @@ -1,6 +1,35 @@ ---- orig/OctetSeqC.h 2005-04-08 10:17:34.108726400 +0200 -+++ OctetSeqC.h 2005-04-08 10:17:41.829828800 +0200 -@@ -141,6 +141,18 @@ +--- orig/OctetSeqC.cpp 2006-05-16 17:15:30.000000000 -0500 ++++ OctetSeqC.cpp 2006-05-16 16:53:30.000000000 -0500 +@@ -119,6 +119,26 @@ + return TAO::demarshal_sequence(strm, _tao_sequence); + } + ++#if (TAO_HAS_VERSIONED_NAMESPACE || ACE_HAS_VERSIONED_NAMESPACE) ++ ++CORBA::Boolean ++operator==(const CORBA::OctetSeq &lhs, const CORBA::OctetSeq &rhs) ++{ ++ return ::operator== ++ (static_cast<const TAO::unbounded_value_sequence< CORBA::Octet > &>(lhs), ++ static_cast<const TAO::unbounded_value_sequence< CORBA::Octet > &>(rhs)); ++} ++ ++CORBA::Boolean ++operator!=(const CORBA::OctetSeq &lhs, const CORBA::OctetSeq &rhs) ++{ ++ return !::operator== ++ (static_cast<const TAO::unbounded_value_sequence< CORBA::Octet > &>(lhs), ++ static_cast<const TAO::unbounded_value_sequence< CORBA::Octet > &>(rhs)); ++} ++ ++#endif /* TAO_HAS_VERSIONED_NAMESPACE || ACE_HAS_VERSIONED_NAMESPACE */ ++ + #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ + + TAO_END_VERSIONED_NAMESPACE_DECL +--- orig/OctetSeqC.h 2006-05-16 17:19:31.000000000 -0500 ++++ OctetSeqC.h 2006-05-16 17:23:31.000000000 -0500 +@@ -131,6 +131,19 @@ { } @@ -13,9 +42,27 @@ +// but we put the instantiation here because the application will +// need to see it in *C.h to avoid the error. +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -+ template class TAO_Export TAO_Unbounded_Sequence<CORBA::OctetSeq>; ++ template class TAO_Export TAO::unbounded_value_sequence<CORBA::OctetSeq>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + ++ + // TAO_IDL - Generated from + // be\be_visitor_sequence/cdr_op_ch.cpp:71 + +@@ -151,6 +164,16 @@ // TAO_IDL - Generated from - // be\be_visitor_sequence/any_op_ch.cpp:52 + // be\be_codegen.cpp:1062 + ++// Added to handle the namespace resolution. ++#if (TAO_HAS_VERSIONED_NAMESPACE || ACE_HAS_VERSIONED_NAMESPACE) ++ ++TAO_Export CORBA::Boolean operator== (const CORBA::OctetSeq &lhs, ++ const CORBA::OctetSeq &rhs); ++TAO_Export CORBA::Boolean operator!= (const CORBA::OctetSeq &lhs, ++ const CORBA::OctetSeq &rhs); ++ ++#endif /* TAO_HAS_VERSIONED_NAMESPACE || ACE_HAS_VERSIONED_NAMESPACE */ ++ + TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) |