summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-14 14:18:34 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-14 14:18:34 +0000
commitca1ccdb4a68244db43d249b9b66fa5eaadc714e2 (patch)
tree6129a23073001d341b4b3268d39b45d154f47d8a
parent55624494f50a923e4e6a94576a3f828ae1d91ded (diff)
downloadATCD-ca1ccdb4a68244db43d249b9b66fa5eaadc714e2.tar.gz
ChangeLogTag: Mon Apr 14 09:16:35 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog_ref7
-rw-r--r--TAO/tao/PortableServer/PortableServerC.cpp4
-rw-r--r--TAO/tao/PortableServer/PortableServerC.h4
3 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 089abefe826..cea450c6fcb 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,10 @@
+Mon Apr 14 09:16:35 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * tao/PortableServer/PortableServerC.cpp:
+ * tao/PortableServer/PortableServerC.h:
+
+ Removed declaration and definition of Any operators for ObjectId.
+
Mon Apr 14 09:06:22 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/be/be_sequence.cpp:
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index fc33def9a8c..3dc56e1922e 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -7457,7 +7457,7 @@ operator>>= (
// TAO_IDL - Generated from
// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
-
+#if 0
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
const PortableServer::ObjectId &_tao_sequence
@@ -7542,7 +7542,7 @@ CORBA::Boolean operator>> (
return 0;
}
-
+#endif
#if (TAO_HAS_MINIMUM_POA == 0)
// TAO_IDL - Generated from
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index c036345b8be..c497eb60271 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -3075,12 +3075,12 @@ TAO_NAMESPACE_CLOSE // module PortableServer
// TAO_IDL - Generated from
// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
-
+/*
TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ObjectId &); // copying version
TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version
TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&);
-
+*/
TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAList &); // copying version
TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAList*); // noncopying version
TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAList *&); // deprecated