summaryrefslogtreecommitdiff
path: root/TAO/tao/diffs
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2006-05-17 23:43:46 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2006-05-17 23:43:46 +0000
commit46d4bbbd5cc081f004bb1de0a05c0dfc75e8552d (patch)
tree68cff20a94baebbadfd81db3dc6d19d352fa3da4 /TAO/tao/diffs
parent12b6c686098ca2a770aa7e5ac558fc6e4424b1af (diff)
downloadATCD-46d4bbbd5cc081f004bb1de0a05c0dfc75e8552d.tar.gz
ChangeLog tag: Wed May 17 23:07:10 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
Diffstat (limited to 'TAO/tao/diffs')
-rw-r--r--TAO/tao/diffs/OctetSeq.diff8
1 files changed, 3 insertions, 5 deletions
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff
index 4c917ccfaa0..1bc77e5a3d4 100644
--- a/TAO/tao/diffs/OctetSeq.diff
+++ b/TAO/tao/diffs/OctetSeq.diff
@@ -49,17 +49,15 @@
// TAO_IDL - Generated from
// be\be_visitor_sequence/cdr_op_ch.cpp:71
-@@ -151,6 +164,16 @@
+@@ -151,6 +164,14 @@
// TAO_IDL - Generated from
// 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);
++TAO_Export bool operator== (const CORBA::OctetSeq &, const CORBA::OctetSeq &);
++TAO_Export bool operator!= (const CORBA::OctetSeq &, const CORBA::OctetSeq &);
+
+#endif /* TAO_HAS_VERSIONED_NAMESPACE || ACE_HAS_VERSIONED_NAMESPACE */
+