summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Dynamic.pidl2
-rw-r--r--TAO/tao/DynamicA.cpp174
-rw-r--r--TAO/tao/DynamicA.h55
-rw-r--r--TAO/tao/DynamicC.cpp461
-rw-r--r--TAO/tao/DynamicC.h62
-rw-r--r--TAO/tao/IOP_CodecA.cpp1
-rw-r--r--TAO/tao/Makefile.bor6
-rw-r--r--TAO/tao/Makefile.tao8
-rw-r--r--TAO/tao/Messaging_PolicyValue.pidl2
-rw-r--r--TAO/tao/Messaging_PolicyValueA.cpp184
-rw-r--r--TAO/tao/Messaging_PolicyValueA.h55
-rw-r--r--TAO/tao/Messaging_PolicyValueC.cpp364
-rw-r--r--TAO/tao/Messaging_PolicyValueC.i6
-rw-r--r--TAO/tao/OctetSeq.pidl2
-rw-r--r--TAO/tao/OctetSeqA.cpp106
-rw-r--r--TAO/tao/OctetSeqA.h45
-rw-r--r--TAO/tao/OctetSeqC.cpp85
-rw-r--r--TAO/tao/OctetSeqC.i6
-rw-r--r--TAO/tao/PolicyC.h37
-rw-r--r--TAO/tao/Policy_Forward.pidl3
-rw-r--r--TAO/tao/Policy_ForwardA.cpp213
-rw-r--r--TAO/tao/Policy_ForwardA.h68
-rw-r--r--TAO/tao/Policy_ForwardC.cpp391
-rw-r--r--TAO/tao/Policy_ForwardC.i8
-rw-r--r--TAO/tao/PortableInterceptorC.h109
-rw-r--r--TAO/tao/Services.pidl3
-rw-r--r--TAO/tao/ServicesA.cpp194
-rw-r--r--TAO/tao/ServicesA.h55
-rw-r--r--TAO/tao/ServicesC.cpp203
-rw-r--r--TAO/tao/ServicesC.i8
-rw-r--r--TAO/tao/StringSeq.pidl3
-rw-r--r--TAO/tao/StringSeqA.cpp174
-rw-r--r--TAO/tao/StringSeqA.h55
-rw-r--r--TAO/tao/StringSeqC.cpp158
-rw-r--r--TAO/tao/StringSeqC.h45
-rw-r--r--TAO/tao/StringSeqC.i4
-rw-r--r--TAO/tao/TAO.pidl2
-rw-r--r--TAO/tao/tao.mpc2
38 files changed, 1860 insertions, 1499 deletions
diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl
index 1af73a78b15..8f8e68b822d 100644
--- a/TAO/tao/Dynamic.pidl
+++ b/TAO/tao/Dynamic.pidl
@@ -10,7 +10,7 @@
* used to generate code is:
*
* tao_idl
- * -o orig -Ge 1 -GT
+ * -o orig -Ge 1 -GT -GA
* -Wb,export_macro=TAO_Export
* -Wb,export_include="tao/TAO_Export.h"
* -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp
new file mode 100644
index 00000000000..3bf19fd658d
--- /dev/null
+++ b/TAO/tao/DynamicA.cpp
@@ -0,0 +1,174 @@
+// -*- 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
+
+#include "DynamicC.h"
+#include "DynamicA.h"
+#include "tao/Typecode.h"
+#include "tao/Any_Dual_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const Dynamic::ParameterList &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert_copy (
+ _tao_any,
+ Dynamic::ParameterList::_tao_any_destructor,
+ Dynamic::_tc_ParameterList,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ Dynamic::ParameterList *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert (
+ _tao_any,
+ Dynamic::ParameterList::_tao_any_destructor,
+ Dynamic::_tc_ParameterList,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ Dynamic::ParameterList *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const Dynamic::ParameterList *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const Dynamic::ParameterList *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::extract (
+ _tao_any,
+ Dynamic::ParameterList::_tao_any_destructor,
+ Dynamic::_tc_ParameterList,
+ _tao_elem
+ );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const Dynamic::ExceptionList &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert_copy (
+ _tao_any,
+ Dynamic::ExceptionList::_tao_any_destructor,
+ Dynamic::_tc_ExceptionList,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ Dynamic::ExceptionList *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert (
+ _tao_any,
+ Dynamic::ExceptionList::_tao_any_destructor,
+ Dynamic::_tc_ExceptionList,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ Dynamic::ExceptionList *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const Dynamic::ExceptionList *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const Dynamic::ExceptionList *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::extract (
+ _tao_any,
+ Dynamic::ExceptionList::_tao_any_destructor,
+ Dynamic::_tc_ExceptionList,
+ _tao_elem
+ );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ Dynamic::ParameterList
+ >;
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ Dynamic::ExceptionList
+ >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ Dynamic::ParameterList \
+ >
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ Dynamic::ExceptionList \
+ >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/DynamicA.h b/TAO/tao/DynamicA.h
new file mode 100644
index 00000000000..aa384a65df9
--- /dev/null
+++ b/TAO/tao/DynamicA.h
@@ -0,0 +1,55 @@
+// -*- 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_DYNAMICA_ANYOP_H_
+#define _TAO_IDL_ORIG_DYNAMICA_ANYOP_H_
+
+#include /**/ "ace/pre.h"
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ParameterList &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, Dynamic::ParameterList*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ParameterList *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ParameterList *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ExceptionList &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, Dynamic::ExceptionList*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ExceptionList *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ExceptionList *&);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index 3d27f734350..380f4b0ecfe 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -26,12 +26,10 @@
// 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:338
#include "DynamicC.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Dual_Impl_T.h"
#if defined (__BORLANDC__)
#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -42,15 +40,15 @@
#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:62
// 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 (_DYNAMIC_PARAMETERLIST_CS_)
#define _DYNAMIC_PARAMETERLIST_CS_
@@ -103,26 +101,26 @@ void Dynamic::ParameterList::_tao_any_destructor (
#endif /* end #if !defined */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_Dynamic_ParameterList[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
38,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x44796e61),
- ACE_NTOHL (0x6d69632f),
- ACE_NTOHL (0x50617261),
- ACE_NTOHL (0x6d657465),
- ACE_NTOHL (0x724c6973),
- ACE_NTOHL (0x743a312e),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x44796e61),
+ ACE_NTOHL (0x6d69632f),
+ ACE_NTOHL (0x50617261),
+ ACE_NTOHL (0x6d657465),
+ ACE_NTOHL (0x724c6973),
+ ACE_NTOHL (0x743a312e),
ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Dynamic/ParameterList:1.0
14,
- ACE_NTOHL (0x50617261),
- ACE_NTOHL (0x6d657465),
- ACE_NTOHL (0x724c6973),
+ ACE_NTOHL (0x50617261),
+ ACE_NTOHL (0x6d657465),
+ ACE_NTOHL (0x724c6973),
ACE_NTOHL (0x74000000), // name = ParameterList
CORBA::tk_sequence, // typecode kind
236, // encapsulation length
@@ -131,61 +129,61 @@ static const CORBA::Long _oc_Dynamic_ParameterList[] =
220, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
34,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x44796e61),
- ACE_NTOHL (0x6d69632f),
- ACE_NTOHL (0x50617261),
- ACE_NTOHL (0x6d657465),
- ACE_NTOHL (0x723a312e),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x44796e61),
+ ACE_NTOHL (0x6d69632f),
+ ACE_NTOHL (0x50617261),
+ ACE_NTOHL (0x6d657465),
+ ACE_NTOHL (0x723a312e),
ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
10,
- ACE_NTOHL (0x50617261),
- ACE_NTOHL (0x6d657465),
+ ACE_NTOHL (0x50617261),
+ ACE_NTOHL (0x6d657465),
ACE_NTOHL (0x72000000), // name = Parameter
2, // member count
9,
- ACE_NTOHL (0x61726775),
- ACE_NTOHL (0x6d656e74),
+ ACE_NTOHL (0x61726775),
+ ACE_NTOHL (0x6d656e74),
ACE_NTOHL (0x0), // name = argument
CORBA::tk_any,
5,
- ACE_NTOHL (0x6d6f6465),
+ ACE_NTOHL (0x6d6f6465),
ACE_NTOHL (0x0), // name = mode
CORBA::tk_enum, // typecode kind
116, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5061),
- ACE_NTOHL (0x72616d65),
- ACE_NTOHL (0x7465724d),
- ACE_NTOHL (0x6f64653a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5061),
+ ACE_NTOHL (0x72616d65),
+ ACE_NTOHL (0x7465724d),
+ ACE_NTOHL (0x6f64653a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
14,
- ACE_NTOHL (0x50617261),
- ACE_NTOHL (0x6d657465),
- ACE_NTOHL (0x724d6f64),
+ ACE_NTOHL (0x50617261),
+ ACE_NTOHL (0x6d657465),
+ ACE_NTOHL (0x724d6f64),
ACE_NTOHL (0x65000000), // name = ParameterMode
3, // member count
9,
- ACE_NTOHL (0x50415241),
- ACE_NTOHL (0x4d5f494e),
+ ACE_NTOHL (0x50415241),
+ ACE_NTOHL (0x4d5f494e),
ACE_NTOHL (0x0), // name = PARAM_IN
10,
- ACE_NTOHL (0x50415241),
- ACE_NTOHL (0x4d5f4f55),
+ ACE_NTOHL (0x50415241),
+ ACE_NTOHL (0x4d5f4f55),
ACE_NTOHL (0x54000000), // name = PARAM_OUT
12,
- ACE_NTOHL (0x50415241),
- ACE_NTOHL (0x4d5f494e),
+ ACE_NTOHL (0x50415241),
+ ACE_NTOHL (0x4d5f494e),
ACE_NTOHL (0x4f555400), // name = PARAM_INOUT
-
+
0U,
@@ -206,45 +204,45 @@ namespace Dynamic
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_Dynamic_ContextList[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x44796e61),
- ACE_NTOHL (0x6d69632f),
- ACE_NTOHL (0x436f6e74),
- ACE_NTOHL (0x6578744c),
- ACE_NTOHL (0x6973743a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x44796e61),
+ ACE_NTOHL (0x6d69632f),
+ ACE_NTOHL (0x436f6e74),
+ ACE_NTOHL (0x6578744c),
+ ACE_NTOHL (0x6973743a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/Dynamic/ContextList:1.0
12,
- ACE_NTOHL (0x436f6e74),
- ACE_NTOHL (0x6578744c),
+ ACE_NTOHL (0x436f6e74),
+ ACE_NTOHL (0x6578744c),
ACE_NTOHL (0x69737400), // name = ContextList
CORBA::tk_alias, // typecode kind for typedefs
80, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5374),
- ACE_NTOHL (0x72696e67),
- ACE_NTOHL (0x5365713a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5374),
+ ACE_NTOHL (0x72696e67),
+ ACE_NTOHL (0x5365713a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
10,
- ACE_NTOHL (0x53747269),
- ACE_NTOHL (0x6e675365),
+ ACE_NTOHL (0x53747269),
+ ACE_NTOHL (0x6e675365),
ACE_NTOHL (0x71000000), // name = StringSeq
CORBA::tk_sequence, // typecode kind
16, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
0U,
@@ -265,8 +263,8 @@ namespace Dynamic
&_tc_TAO_tc_Dynamic_ContextList;
}
-// 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 (_DYNAMIC_EXCEPTIONLIST_CS_)
#define _DYNAMIC_EXCEPTIONLIST_CS_
@@ -319,26 +317,26 @@ void Dynamic::ExceptionList::_tao_any_destructor (
#endif /* end #if !defined */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_Dynamic_ExceptionList[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
38,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x44796e61),
- ACE_NTOHL (0x6d69632f),
- ACE_NTOHL (0x45786365),
- ACE_NTOHL (0x7074696f),
- ACE_NTOHL (0x6e4c6973),
- ACE_NTOHL (0x743a312e),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x44796e61),
+ ACE_NTOHL (0x6d69632f),
+ ACE_NTOHL (0x45786365),
+ ACE_NTOHL (0x7074696f),
+ ACE_NTOHL (0x6e4c6973),
+ ACE_NTOHL (0x743a312e),
ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Dynamic/ExceptionList:1.0
14,
- ACE_NTOHL (0x45786365),
- ACE_NTOHL (0x7074696f),
- ACE_NTOHL (0x6e4c6973),
+ ACE_NTOHL (0x45786365),
+ ACE_NTOHL (0x7074696f),
+ ACE_NTOHL (0x6e4c6973),
ACE_NTOHL (0x74000000), // name = ExceptionList
CORBA::tk_sequence, // typecode kind
12, // encapsulation length
@@ -364,47 +362,47 @@ namespace Dynamic
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_Dynamic_RequestContext[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
39,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x44796e61),
- ACE_NTOHL (0x6d69632f),
- ACE_NTOHL (0x52657175),
- ACE_NTOHL (0x65737443),
- ACE_NTOHL (0x6f6e7465),
- ACE_NTOHL (0x78743a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x44796e61),
+ ACE_NTOHL (0x6d69632f),
+ ACE_NTOHL (0x52657175),
+ ACE_NTOHL (0x65737443),
+ ACE_NTOHL (0x6f6e7465),
+ ACE_NTOHL (0x78743a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Dynamic/RequestContext:1.0
15,
- ACE_NTOHL (0x52657175),
- ACE_NTOHL (0x65737443),
- ACE_NTOHL (0x6f6e7465),
+ ACE_NTOHL (0x52657175),
+ ACE_NTOHL (0x65737443),
+ ACE_NTOHL (0x6f6e7465),
ACE_NTOHL (0x78740000), // name = RequestContext
CORBA::tk_alias, // typecode kind for typedefs
80, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5374),
- ACE_NTOHL (0x72696e67),
- ACE_NTOHL (0x5365713a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5374),
+ ACE_NTOHL (0x72696e67),
+ ACE_NTOHL (0x5365713a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
10,
- ACE_NTOHL (0x53747269),
- ACE_NTOHL (0x6e675365),
+ ACE_NTOHL (0x53747269),
+ ACE_NTOHL (0x6e675365),
ACE_NTOHL (0x71000000), // name = StringSeq
CORBA::tk_sequence, // typecode kind
16, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
0U,
@@ -426,123 +424,7 @@ namespace Dynamic
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const Dynamic::ParameterList &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert_copy (
- _tao_any,
- Dynamic::ParameterList::_tao_any_destructor,
- Dynamic::_tc_ParameterList,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- Dynamic::ParameterList *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert (
- _tao_any,
- Dynamic::ParameterList::_tao_any_destructor,
- Dynamic::_tc_ParameterList,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- Dynamic::ParameterList *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const Dynamic::ParameterList *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const Dynamic::ParameterList *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::extract (
- _tao_any,
- Dynamic::ParameterList::_tao_any_destructor,
- Dynamic::_tc_ParameterList,
- _tao_elem
- );
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const Dynamic::ExceptionList &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert_copy (
- _tao_any,
- Dynamic::ExceptionList::_tao_any_destructor,
- Dynamic::_tc_ExceptionList,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- Dynamic::ExceptionList *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert (
- _tao_any,
- Dynamic::ExceptionList::_tao_any_destructor,
- Dynamic::_tc_ExceptionList,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- Dynamic::ExceptionList *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const Dynamic::ExceptionList *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const Dynamic::ExceptionList *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::extract (
- _tao_any,
- Dynamic::ExceptionList::_tao_any_destructor,
- Dynamic::_tc_ExceptionList,
- _tao_elem
- );
-}
-
-// 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:95
#if !defined _TAO_CDR_OP_Dynamic_ParameterList_CPP_
#define _TAO_CDR_OP_Dynamic_ParameterList_CPP_
@@ -553,20 +435,20 @@ CORBA::Boolean operator<< (
)
{
CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+
if (strm << _tao_seq_len)
{
// Encode all elements.
CORBA::Boolean _tao_marshal_flag = 1;
-
+
for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
{
_tao_marshal_flag = (strm << _tao_sequence[i]);
}
-
+
return _tao_marshal_flag;
}
-
+
return 0;
}
@@ -576,7 +458,7 @@ CORBA::Boolean operator>> (
)
{
CORBA::ULong _tao_seq_len;
-
+
if (strm >> _tao_seq_len)
{
// Add a check to the length of the sequence
@@ -586,35 +468,35 @@ CORBA::Boolean operator>> (
{
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.
CORBA::Boolean _tao_marshal_flag = 1;
-
+
for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
{
_tao_marshal_flag = (strm >> _tao_sequence[i]);
}
-
+
return _tao_marshal_flag;
-
+
}
-
+
return 0;
}
#endif /* _TAO_CDR_OP_Dynamic_ParameterList_CPP_ */
// 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:95
#if !defined _TAO_CDR_OP_Dynamic_ExceptionList_CPP_
#define _TAO_CDR_OP_Dynamic_ExceptionList_CPP_
@@ -625,20 +507,20 @@ CORBA::Boolean operator<< (
)
{
CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+
if (strm << _tao_seq_len)
{
// Encode all elements.
CORBA::Boolean _tao_marshal_flag = 1;
-
+
for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
{
_tao_marshal_flag = (strm << _tao_sequence[i].in ());
}
-
+
return _tao_marshal_flag;
}
-
+
return 0;
}
@@ -648,7 +530,7 @@ CORBA::Boolean operator>> (
)
{
CORBA::ULong _tao_seq_len;
-
+
if (strm >> _tao_seq_len)
{
// Add a check to the length of the sequence
@@ -658,60 +540,38 @@ CORBA::Boolean operator>> (
{
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.
CORBA::Boolean _tao_marshal_flag = 1;
-
+
for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
{
_tao_marshal_flag = (strm >> _tao_sequence[i].out ());
}
-
+
return _tao_marshal_flag;
-
+
}
-
+
return 0;
}
#endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1702
+// be/be_visitor_root/root.cpp:1725
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-/*
- template class
- TAO::Any_Basic_Impl_T<
- CORBA::SetOverrideType
- >;
-
- template class
- TAO::Any_Basic_Impl_T<
- CORBA::TCKind
- >;
-
- template class
- TAO::Any_Basic_Impl_T<
- CORBA::exception_type
- >;
-
- template class
- TAO::Any_Basic_Impl_T<
- CORBA::ParameterMode
- >;
-*/
-
template class
TAO_VarSeq_Var_T<
Dynamic::ParameterList,
@@ -731,8 +591,8 @@ CORBA::Boolean operator>> (
Dynamic::Parameter
>;
-#if !defined (_DYNAMIC_PARAMETERLIST_SEQUENCE_CS_)
-#define _DYNAMIC_PARAMETERLIST_SEQUENCE_CS_
+#if !defined (_DYNAMIC_PARAMETER__EXPLICIT_CS_)
+#define _DYNAMIC_PARAMETER__EXPLICIT_CS_
template class
TAO_Unbounded_Sequence<
@@ -742,11 +602,6 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
template class
- TAO::Any_Dual_Impl_T<
- Dynamic::ParameterList
- >;
-
- template class
TAO_Pseudo_Object_Manager<
CORBA::TypeCode
>;
@@ -776,34 +631,9 @@ CORBA::Boolean operator>> (
>
>;
- template class
- TAO::Any_Dual_Impl_T<
- Dynamic::ExceptionList
- >;
-
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
# pragma instantiate \
- TAO::Any_Basic_Impl_T< \
- CORBA::SetOverrideType \
- >
-
-# pragma instantiate \
- TAO::Any_Basic_Impl_T< \
- CORBA::TCKind \
- >
-
-# pragma instantiate \
- TAO::Any_Basic_Impl_T< \
- CORBA::exception_type \
- >
-
-# pragma instantiate \
- TAO::Any_Basic_Impl_T< \
- CORBA::ParameterMode \
- >
-
-# pragma instantiate \
TAO_VarSeq_Var_T< \
Dynamic::ParameterList, \
Dynamic::Parameter \
@@ -822,8 +652,8 @@ CORBA::Boolean operator>> (
Dynamic::Parameter \
>
-#if !defined (_DYNAMIC_PARAMETERLIST_CS_)
-#define _DYNAMIC_PARAMETERLIST_CS_
+#if !defined (_DYNAMIC_PARAMETER__EXPLICIT_CS_)
+#define _DYNAMIC_PARAMETER__EXPLICIT_CS_
# pragma instantiate \
TAO_Unbounded_Sequence< \
@@ -833,11 +663,6 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- Dynamic::ParameterList \
- >
-
-# pragma instantiate \
TAO_MngSeq_Var_T< \
Dynamic::ExceptionList, \
TAO_Pseudo_Object_Manager< \
@@ -862,9 +687,5 @@ CORBA::Boolean operator>> (
> \
>
-# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- Dynamic::ExceptionList \
- >
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index 31c0e483dd6..a73c8c4e4b9 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -26,19 +26,28 @@
// 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:186
#ifndef _TAO_IDL_ORIG_DYNAMICC_H_
#define _TAO_IDL_ORIG_DYNAMICC_H_
#include /**/ "ace/pre.h"
-#include "Dynamic_ParameterC.h"
+#include "tao/ORB.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "tao/TAO_Export.h"
+#include "tao/CDR.h"
+#include "tao/Environment.h"
+#include "tao/Typecode.h"
+#include "tao/Sequence_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+
+#include "Dynamic_ParameterC.h"
#include "StringSeqC.h"
#if defined (TAO_EXPORT_MACRO)
@@ -65,13 +74,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 Dynamic
{
// 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 (_DYNAMIC_PARAMETERLIST_CH_)
#define _DYNAMIC_PARAMETERLIST_CH_
@@ -119,24 +128,24 @@ namespace Dynamic
#endif /* end #if !defined */
// TAO_IDL - Generated from
- // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+ // be/be_visitor_typecode/typecode_decl.cpp:44
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterList;
// TAO_IDL - Generated from
- // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
+ // be/be_visitor_typedef/typedef_ch.cpp:435
typedef CORBA::StringSeq ContextList;
typedef CORBA::StringSeq_var ContextList_var;
typedef CORBA::StringSeq_out ContextList_out;
// TAO_IDL - Generated from
- // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+ // be/be_visitor_typecode/typecode_decl.cpp:44
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextList;
// 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 (_DYNAMIC_EXCEPTIONLIST_CH_)
#define _DYNAMIC_EXCEPTIONLIST_CH_
@@ -188,29 +197,29 @@ namespace Dynamic
#endif /* end #if !defined */
// TAO_IDL - Generated from
- // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+ // be/be_visitor_typecode/typecode_decl.cpp:44
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionList;
// TAO_IDL - Generated from
- // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
+ // be/be_visitor_typedef/typedef_ch.cpp:435
typedef CORBA::StringSeq RequestContext;
typedef CORBA::StringSeq_var RequestContext_var;
typedef CORBA::StringSeq_out RequestContext_out;
// TAO_IDL - Generated from
- // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+ // be/be_visitor_typecode/typecode_decl.cpp:44
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestContext;
// 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 Dynamic
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
+// be/be_visitor_traits.cpp:50
// Traits specializations.
namespace TAO
@@ -218,28 +227,12 @@ namespace TAO
};
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ParameterList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Dynamic::ParameterList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ParameterList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ParameterList *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ExceptionList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Dynamic::ExceptionList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ExceptionList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ExceptionList *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+// 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:70
#if !defined _TAO_CDR_OP_Dynamic_ParameterList_H_
#define _TAO_CDR_OP_Dynamic_ParameterList_H_
@@ -256,7 +249,7 @@ TAO_Export CORBA::Boolean operator>> (
#endif /* _TAO_CDR_OP_Dynamic_ParameterList_H_ */
// 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:70
#if !defined _TAO_CDR_OP_Dynamic_ExceptionList_H_
#define _TAO_CDR_OP_Dynamic_ExceptionList_H_
@@ -273,12 +266,12 @@ TAO_Export CORBA::Boolean operator>> (
#endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+// 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:920
+// be/be_codegen.cpp:1050
#if defined (__ACE_INLINE__)
#include "DynamicC.i"
@@ -293,5 +286,6 @@ TAO_Export CORBA::Boolean operator>> (
#endif /* __BORLANDC__ */
#include /**/ "ace/post.h"
+
#endif /* ifndef */
diff --git a/TAO/tao/IOP_CodecA.cpp b/TAO/tao/IOP_CodecA.cpp
index ed078f03fb6..2fb69c13e6c 100644
--- a/TAO/tao/IOP_CodecA.cpp
+++ b/TAO/tao/IOP_CodecA.cpp
@@ -591,3 +591,4 @@ CORBA::Boolean operator>>= (
#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index f8f2a364228..233403bc0a0 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -79,6 +79,7 @@ OBJFILES = \
$(OBJDIR)\Default_Thread_Lane_Resources_Manager.obj \
$(OBJDIR)\DomainC.obj \
$(OBJDIR)\DynamicC.obj \
+ $(OBJDIR)\DynamicA.obj \
$(OBJDIR)\Dynamic_Adapter.obj \
$(OBJDIR)\Dynamic_ParameterC.obj \
$(OBJDIR)\Encodable.obj \
@@ -148,6 +149,7 @@ OBJFILES = \
$(OBJDIR)\Marshal.obj \
$(OBJDIR)\MCAST_Parser.obj \
$(OBJDIR)\Messaging_PolicyValueC.obj \
+ $(OBJDIR)\Messaging_PolicyValueA.obj \
$(OBJDIR)\Messaging_SyncScopeC.obj \
$(OBJDIR)\Muxed_TMS.obj \
$(OBJDIR)\NVList.obj \
@@ -166,6 +168,7 @@ OBJFILES = \
$(OBJDIR)\Object_Proxy_Impl.obj \
$(OBJDIR)\Object_Ref_Table.obj \
$(OBJDIR)\OctetSeqC.obj \
+ $(OBJDIR)\OctetSeqA.obj \
$(OBJDIR)\ParameterMode.obj \
$(OBJDIR)\Parser_Registry.obj \
$(OBJDIR)\PICurrent.obj \
@@ -174,6 +177,7 @@ OBJFILES = \
$(OBJDIR)\Pluggable_Messaging.obj \
$(OBJDIR)\Pluggable_Messaging_Utils.obj \
$(OBJDIR)\Policy_ForwardC.obj \
+ $(OBJDIR)\Policy_ForwardA.obj \
$(OBJDIR)\PolicyC.obj \
$(OBJDIR)\PolicyA.obj \
$(OBJDIR)\PolicyFactory_Registry.obj \
@@ -205,9 +209,11 @@ OBJFILES = \
$(OBJDIR)\Service_Callbacks.obj \
$(OBJDIR)\Service_Context.obj \
$(OBJDIR)\ServicesC.obj \
+ $(OBJDIR)\ServicesA.obj \
$(OBJDIR)\Services_Activate.obj \
$(OBJDIR)\Special_Basic_Arguments.obj \
$(OBJDIR)\StringSeqC.obj \
+ $(OBJDIR)\StringSeqA.obj \
$(OBJDIR)\Stub.obj \
$(OBJDIR)\Stub_Factory.obj \
$(OBJDIR)\Sync_Strategies.obj \
diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao
index 2a0fd05eb44..5bfa9a77142 100644
--- a/TAO/tao/Makefile.tao
+++ b/TAO/tao/Makefile.tao
@@ -160,6 +160,7 @@ ORB_CORE_FILES = \
ObjectIdListC \
ORB \
Policy_ForwardC \
+ Policy_ForwardA \
PolicyC \
PolicyA \
Policy_Validator \
@@ -202,10 +203,13 @@ ORB_CORE_FILES = \
PICurrent \
PICurrent_ORBInitializer \
DynamicC \
+ DynamicA \
Dynamic_ParameterC \
ParameterMode \
OctetSeqC \
+ OctetSeqA \
StringSeqC \
+ StringSeqA \
Codeset_Manager \
Codeset_Translator_Factory \
ORB_Core \
@@ -372,6 +376,7 @@ ifeq ($(minimum_corba),0)
ORB_CORE_FILES += \
ServicesC \
+ ServicesA \
NVList \
Dynamic_Adapter
@@ -382,7 +387,8 @@ ifeq ($(corba_messaging),1)
ORB_CORE_FILES += \
Policy_Manager \
Buffering_Constraint_Policy \
- Messaging_PolicyValueC
+ Messaging_PolicyValueC \
+ Messaging_PolicyValueA
endif # corba_messaging
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
index 1d7991e4664..af1a9e5f505 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 -Gp -Gd -Ge 1 -GT
+ * -o orig -Ge 1 -GT -GA
* -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
new file mode 100644
index 00000000000..69ea8faace5
--- /dev/null
+++ b/TAO/tao/Messaging_PolicyValueA.cpp
@@ -0,0 +1,184 @@
+// -*- 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
+
+#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
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const Messaging::PolicyValue &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert_copy (
+ _tao_any,
+ Messaging::PolicyValue::_tao_any_destructor,
+ Messaging::_tc_PolicyValue,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ Messaging::PolicyValue *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert (
+ _tao_any,
+ Messaging::PolicyValue::_tao_any_destructor,
+ Messaging::_tc_PolicyValue,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ Messaging::PolicyValue *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const Messaging::PolicyValue *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const Messaging::PolicyValue *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::extract (
+ _tao_any,
+ Messaging::PolicyValue::_tao_any_destructor,
+ Messaging::_tc_PolicyValue,
+ _tao_elem
+ );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const Messaging::PolicyValueSeq &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert_copy (
+ _tao_any,
+ Messaging::PolicyValueSeq::_tao_any_destructor,
+ Messaging::_tc_PolicyValueSeq,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ Messaging::PolicyValueSeq *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert (
+ _tao_any,
+ Messaging::PolicyValueSeq::_tao_any_destructor,
+ Messaging::_tc_PolicyValueSeq,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ Messaging::PolicyValueSeq *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const Messaging::PolicyValueSeq *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const Messaging::PolicyValueSeq *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::extract (
+ _tao_any,
+ Messaging::PolicyValueSeq::_tao_any_destructor,
+ Messaging::_tc_PolicyValueSeq,
+ _tao_elem
+ );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ Messaging::PolicyValue::_tao_seq_CORBA_Octet_
+ >;
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ Messaging::PolicyValue
+ >;
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ Messaging::PolicyValueSeq
+ >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ Messaging::PolicyValue::_tao_seq_CORBA_Octet_ \
+ >
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ Messaging::PolicyValue \
+ >
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ Messaging::PolicyValueSeq \
+ >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/Messaging_PolicyValueA.h b/TAO/tao/Messaging_PolicyValueA.h
new file mode 100644
index 00000000000..39be5b880f5
--- /dev/null
+++ b/TAO/tao/Messaging_PolicyValueA.h
@@ -0,0 +1,55 @@
+// -*- 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 a19e460d971..2e0e8b09e9c 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -26,13 +26,12 @@
// 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:338
#include "Messaging_PolicyValueC.h"
-#include "Any_Dual_Impl_T.h"
-#include "Typecode.h"
-#include "ORB_Core.h"
+#include "tao/ORB_Core.h"
+#include "tao/Typecode.h"
#if defined (__BORLANDC__)
#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -43,7 +42,7 @@
#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:62
// Arg traits specializations.
namespace TAO
@@ -51,52 +50,52 @@ namespace TAO
};
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_Messaging_PolicyValue[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
38,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x4d657373),
- ACE_NTOHL (0x6167696e),
- ACE_NTOHL (0x672f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x56616c75),
- ACE_NTOHL (0x653a312e),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x4d657373),
+ ACE_NTOHL (0x6167696e),
+ ACE_NTOHL (0x672f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x56616c75),
+ ACE_NTOHL (0x653a312e),
ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
12,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795661),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795661),
ACE_NTOHL (0x6c756500), // name = PolicyValue
2, // member count
6,
- ACE_NTOHL (0x70747970),
+ ACE_NTOHL (0x70747970),
ACE_NTOHL (0x65000000), // name = ptype
CORBA::tk_alias, // typecode kind for typedefs
64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
33,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x54797065),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x54797065),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
11,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795479),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795479),
ACE_NTOHL (0x70650000), // name = PolicyType
CORBA::tk_ulong,
7,
- ACE_NTOHL (0x7076616c),
+ ACE_NTOHL (0x7076616c),
ACE_NTOHL (0x75650000), // name = pvalue
CORBA::tk_sequence, // typecode kind
12, // encapsulation length
@@ -121,10 +120,10 @@ namespace Messaging
&_tc_TAO_tc_Messaging_PolicyValue;
}
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from
+// be/be_visitor_structure/structure_cs.cpp:66
-void
+void
Messaging::PolicyValue::_tao_any_destructor (
void *_tao_void_pointer
)
@@ -134,8 +133,8 @@ Messaging::PolicyValue::_tao_any_destructor (
delete _tao_tmp_pointer;
}
-// 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 (_MESSAGING_POLICYVALUE__TAO_SEQ_CORBA_OCTET__CS_)
#define _MESSAGING_POLICYVALUE__TAO_SEQ_CORBA_OCTET__CS_
@@ -187,8 +186,8 @@ void Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_any_destructor (
#endif /* end #if !defined */
-// 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 (_MESSAGING_POLICYVALUESEQ_CS_)
#define _MESSAGING_POLICYVALUESEQ_CS_
@@ -241,27 +240,27 @@ void Messaging::PolicyValueSeq::_tao_any_destructor (
#endif /* end #if !defined */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
41,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x4d657373),
- ACE_NTOHL (0x6167696e),
- ACE_NTOHL (0x672f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x56616c75),
- ACE_NTOHL (0x65536571),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x4d657373),
+ ACE_NTOHL (0x6167696e),
+ ACE_NTOHL (0x672f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x56616c75),
+ ACE_NTOHL (0x65536571),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0
15,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795661),
- ACE_NTOHL (0x6c756553),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795661),
+ ACE_NTOHL (0x6c756553),
ACE_NTOHL (0x65710000), // name = PolicyValueSeq
CORBA::tk_sequence, // typecode kind
200, // encapsulation length
@@ -270,46 +269,46 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
184, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
38,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x4d657373),
- ACE_NTOHL (0x6167696e),
- ACE_NTOHL (0x672f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x56616c75),
- ACE_NTOHL (0x653a312e),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x4d657373),
+ ACE_NTOHL (0x6167696e),
+ ACE_NTOHL (0x672f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x56616c75),
+ ACE_NTOHL (0x653a312e),
ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
12,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795661),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795661),
ACE_NTOHL (0x6c756500), // name = PolicyValue
2, // member count
6,
- ACE_NTOHL (0x70747970),
+ ACE_NTOHL (0x70747970),
ACE_NTOHL (0x65000000), // name = ptype
CORBA::tk_alias, // typecode kind for typedefs
64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
33,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x54797065),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x54797065),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
11,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795479),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795479),
ACE_NTOHL (0x70650000), // name = PolicyType
CORBA::tk_ulong,
7,
- ACE_NTOHL (0x7076616c),
+ ACE_NTOHL (0x7076616c),
ACE_NTOHL (0x75650000), // name = pvalue
CORBA::tk_sequence, // typecode kind
12, // encapsulation length
@@ -338,123 +337,7 @@ namespace Messaging
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const Messaging::PolicyValue &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert_copy (
- _tao_any,
- Messaging::PolicyValue::_tao_any_destructor,
- Messaging::_tc_PolicyValue,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- Messaging::PolicyValue *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert (
- _tao_any,
- Messaging::PolicyValue::_tao_any_destructor,
- Messaging::_tc_PolicyValue,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- Messaging::PolicyValue *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const Messaging::PolicyValue *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const Messaging::PolicyValue *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::extract (
- _tao_any,
- Messaging::PolicyValue::_tao_any_destructor,
- Messaging::_tc_PolicyValue,
- _tao_elem
- );
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const Messaging::PolicyValueSeq &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert_copy (
- _tao_any,
- Messaging::PolicyValueSeq::_tao_any_destructor,
- Messaging::_tc_PolicyValueSeq,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- Messaging::PolicyValueSeq *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert (
- _tao_any,
- Messaging::PolicyValueSeq::_tao_any_destructor,
- Messaging::_tc_PolicyValueSeq,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- Messaging::PolicyValueSeq *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const Messaging::PolicyValueSeq *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const Messaging::PolicyValueSeq *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::extract (
- _tao_any,
- Messaging::PolicyValueSeq::_tao_any_destructor,
- Messaging::_tc_PolicyValueSeq,
- _tao_elem
- );
-}
-
-// 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:95
#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__CPP_
#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__CPP_
@@ -465,27 +348,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>*, (Messaging::PolicyValue::_tao_seq_CORBA_Octet_ *)&_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;
}
@@ -495,7 +378,7 @@ CORBA::Boolean operator>> (
)
{
CORBA::ULong _tao_seq_len;
-
+
if (strm >> _tao_seq_len)
{
// Add a check to the length of the sequence
@@ -505,18 +388,18 @@ CORBA::Boolean operator>> (
{
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))
@@ -526,7 +409,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);
@@ -537,18 +420,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_Messaging_PolicyValue__tao_seq_CORBA_Octet__CPP_ */
// 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:95
#if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_
#define _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_
@@ -559,20 +442,20 @@ CORBA::Boolean operator<< (
)
{
CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+
if (strm << _tao_seq_len)
{
// Encode all elements.
CORBA::Boolean _tao_marshal_flag = 1;
-
+
for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
{
_tao_marshal_flag = (strm << _tao_sequence[i]);
}
-
+
return _tao_marshal_flag;
}
-
+
return 0;
}
@@ -582,7 +465,7 @@ CORBA::Boolean operator>> (
)
{
CORBA::ULong _tao_seq_len;
-
+
if (strm >> _tao_seq_len)
{
// Add a check to the length of the sequence
@@ -592,44 +475,39 @@ CORBA::Boolean operator>> (
{
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.
CORBA::Boolean _tao_marshal_flag = 1;
-
+
for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
{
_tao_marshal_flag = (strm >> _tao_sequence[i]);
}
-
+
return _tao_marshal_flag;
-
+
}
-
+
return 0;
}
#endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703
+// be/be_visitor_root/root.cpp:1725
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
template class
- TAO::Any_Dual_Impl_T<
- Messaging::PolicyValue::_tao_seq_CORBA_Octet_
- >;
-
- template class
TAO_Var_Var_T<
Messaging::PolicyValue
>;
@@ -646,11 +524,6 @@ CORBA::Boolean operator>> (
>;
template class
- TAO::Any_Dual_Impl_T<
- Messaging::PolicyValue
- >;
-
- template class
TAO_VarSeq_Var_T<
Messaging::PolicyValueSeq,
Messaging::PolicyValue
@@ -669,8 +542,8 @@ CORBA::Boolean operator>> (
Messaging::PolicyValue
>;
-#if !defined (_MESSAGING_POLICYVALUESEQ__EXPLICIT_CS_)
-#define _MESSAGING_POLICYVALUESEQ__EXPLICIT_CS_
+#if !defined (_MESSAGING_POLICYVALUE__EXPLICIT_CS_)
+#define _MESSAGING_POLICYVALUE__EXPLICIT_CS_
template class
TAO_Unbounded_Sequence<
@@ -679,19 +552,9 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
- template class
- TAO::Any_Dual_Impl_T<
- Messaging::PolicyValueSeq
- >;
-
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- Messaging::PolicyValue::_tao_seq_CORBA_Octet_ \
- >
-
-# pragma instantiate \
TAO_Var_Var_T< \
Messaging::PolicyValue \
>
@@ -708,11 +571,6 @@ CORBA::Boolean operator>> (
>
# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- Messaging::PolicyValue \
- >
-
-# pragma instantiate \
TAO_VarSeq_Var_T< \
Messaging::PolicyValueSeq, \
Messaging::PolicyValue \
@@ -731,8 +589,8 @@ CORBA::Boolean operator>> (
Messaging::PolicyValue \
>
-#if !defined (_MESSAGING_POLICYVALUESEQ__EXPLICIT_CS_)
-#define _MESSAGING_POLICYVALUESEQ__EXPLICIT_CS_
+#if !defined (_MESSAGING_POLICYVALUE__EXPLICIT_CS_)
+#define _MESSAGING_POLICYVALUE__EXPLICIT_CS_
# pragma instantiate \
TAO_Unbounded_Sequence< \
@@ -741,9 +599,5 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
-# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- Messaging::PolicyValueSeq \
- >
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Messaging_PolicyValueC.i b/TAO/tao/Messaging_PolicyValueC.i
index 06b0b9503c8..33b6e399bd3 100644
--- a/TAO/tao/Messaging_PolicyValueC.i
+++ b/TAO/tao/Messaging_PolicyValueC.i
@@ -27,7 +27,7 @@
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__I_
#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__I_
@@ -45,7 +45,7 @@ CORBA::Boolean TAO_Export operator>> (
#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__I_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
+// be/be_visitor_structure/cdr_op_ci.cpp:70
ACE_INLINE
CORBA::Boolean operator<< (
@@ -70,7 +70,7 @@ CORBA::Boolean operator>> (
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
#if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_I_
#define _TAO_CDR_OP_Messaging_PolicyValueSeq_I_
diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl
index 85ffa91d8c0..10175a867a4 100644
--- a/TAO/tao/OctetSeq.pidl
+++ b/TAO/tao/OctetSeq.pidl
@@ -8,7 +8,7 @@
// The command used to generate code is:
//
// tao_idl
-// -o orig -Sa -Ge 1 -GT
+// -o orig -Ge 1 -GT -GA
// -Wb,export_macro=TAO_Export
// -Wb,export_include="tao/corbafwd.h"
// -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp
new file mode 100644
index 00000000000..cce1645ffe5
--- /dev/null
+++ b/TAO/tao/OctetSeqA.cpp
@@ -0,0 +1,106 @@
+// -*- 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
+
+#include "OctetSeqC.h"
+#include "OctetSeqA.h"
+#include "tao/Typecode.h"
+#include "tao/Any_Dual_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const CORBA::OctetSeq &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy (
+ _tao_any,
+ CORBA::OctetSeq::_tao_any_destructor,
+ CORBA::_tc_OctetSeq,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ CORBA::OctetSeq *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert (
+ _tao_any,
+ CORBA::OctetSeq::_tao_any_destructor,
+ CORBA::_tc_OctetSeq,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ CORBA::OctetSeq *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const CORBA::OctetSeq *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const CORBA::OctetSeq *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract (
+ _tao_any,
+ CORBA::OctetSeq::_tao_any_destructor,
+ CORBA::_tc_OctetSeq,
+ _tao_elem
+ );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ CORBA::OctetSeq
+ >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ CORBA::OctetSeq \
+ >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/OctetSeqA.h b/TAO/tao/OctetSeqA.h
new file mode 100644
index 00000000000..4ab95af16b9
--- /dev/null
+++ b/TAO/tao/OctetSeqA.h
@@ -0,0 +1,45 @@
+// -*- 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_OCTETSEQA_ANYOP_H_
+#define _TAO_IDL_ORIG_OCTETSEQA_ANYOP_H_
+
+
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_ch.cpp:52
+
+ void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
+ void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version
+ CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated
+ CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
+
+#endif /* ifndef */
+
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 1e255af8b3e..01025cd1a9d 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -26,13 +26,12 @@
// 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:338
#include "OctetSeqC.h"
-#include "ORB_Core.h"
-#include "Any_Dual_Impl_T.h"
-#include "Typecode.h"
+#include "tao/ORB_Core.h"
+#include "tao/Typecode.h"
#if defined (__BORLANDC__)
#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -43,7 +42,7 @@
#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:62
// Arg traits specializations.
namespace TAO
@@ -51,7 +50,7 @@ namespace TAO
};
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66
+// be/be_visitor_sequence/sequence_cs.cpp:65
#if !defined (_CORBA_OCTETSEQ_CS_)
#define _CORBA_OCTETSEQ_CS_
@@ -104,7 +103,7 @@ void CORBA::OctetSeq::_tao_any_destructor (
#endif /* end #if !defined */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_OctetSeq[] =
{
@@ -145,66 +144,8 @@ namespace CORBA
&_tc_TAO_tc_CORBA_OctetSeq;
}
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const CORBA::OctetSeq &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy (
- _tao_any,
- CORBA::OctetSeq::_tao_any_destructor,
- CORBA::_tc_OctetSeq,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- CORBA::OctetSeq *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert (
- _tao_any,
- CORBA::OctetSeq::_tao_any_destructor,
- CORBA::_tc_OctetSeq,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- CORBA::OctetSeq *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const CORBA::OctetSeq *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const CORBA::OctetSeq *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract (
- _tao_any,
- CORBA::OctetSeq::_tao_any_destructor,
- CORBA::_tc_OctetSeq,
- _tao_elem
- );
-}
-
// 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:95
#if !defined _TAO_CDR_OP_CORBA_OctetSeq_CPP_
#define _TAO_CDR_OP_CORBA_OctetSeq_CPP_
@@ -298,7 +239,7 @@ CORBA::Boolean operator>> (
#endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703
+// be/be_visitor_root/root.cpp:1725
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -321,11 +262,6 @@ CORBA::Boolean operator>> (
CORBA::Octet
>;
- template class
- TAO::Any_Dual_Impl_T<
- CORBA::OctetSeq
- >;
-
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
# pragma instantiate \
@@ -347,10 +283,5 @@ CORBA::Boolean operator>> (
CORBA::Octet \
>
-# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- CORBA::OctetSeq \
- >
-
#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/OctetSeqC.i b/TAO/tao/OctetSeqC.i
index c1b2b0c585b..3ce120df461 100644
--- a/TAO/tao/OctetSeqC.i
+++ b/TAO/tao/OctetSeqC.i
@@ -27,17 +27,17 @@
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
#if !defined _TAO_CDR_OP_CORBA_OctetSeq_I_
#define _TAO_CDR_OP_CORBA_OctetSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const CORBA::OctetSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
CORBA::OctetSeq &
);
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 3c21e2a3bc5..fe6ff306880 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -638,43 +638,6 @@ namespace TAO
};
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyError &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyError*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyError *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyError *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::InvalidPolicies &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::InvalidPolicies*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InvalidPolicies *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InvalidPolicies *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyManager_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyCurrent_ptr &);
-
-// TAO_IDL - Generated from
// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
#ifndef __ACE_INLINE__
diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl
index cecf57db3e4..c041a4193e3 100644
--- a/TAO/tao/Policy_Forward.pidl
+++ b/TAO/tao/Policy_Forward.pidl
@@ -15,9 +15,8 @@
* command used for this is:
*
* tao_idl.exe
- * -o orig -Ge 1 -GT
+ * -o orig -Ge 1 -GT -GA
* -Wb,export_macro=TAO_Export
- * -Wb,export_include="tao/corbafwd.h"
* -Wb,pre_include="ace/pre.h"
* -Wb,post_include="ace/post.h"
* Policy_Forward.pidl
diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp
new file mode 100644
index 00000000000..4c2f1c591ea
--- /dev/null
+++ b/TAO/tao/Policy_ForwardA.cpp
@@ -0,0 +1,213 @@
+// -*- 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
+
+#include "Policy_ForwardC.h"
+#include "Policy_ForwardA.h"
+#include "tao/Typecode.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const CORBA::PolicyList &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy (
+ _tao_any,
+ CORBA::PolicyList::_tao_any_destructor,
+ CORBA::_tc_PolicyList,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ CORBA::PolicyList *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert (
+ _tao_any,
+ CORBA::PolicyList::_tao_any_destructor,
+ CORBA::_tc_PolicyList,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ CORBA::PolicyList *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const CORBA::PolicyList *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const CORBA::PolicyList *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract (
+ _tao_any,
+ CORBA::PolicyList::_tao_any_destructor,
+ CORBA::_tc_PolicyList,
+ _tao_elem
+ );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const CORBA::PolicyTypeSeq &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert_copy (
+ _tao_any,
+ CORBA::PolicyTypeSeq::_tao_any_destructor,
+ CORBA::_tc_PolicyTypeSeq,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ CORBA::PolicyTypeSeq *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert (
+ _tao_any,
+ CORBA::PolicyTypeSeq::_tao_any_destructor,
+ CORBA::_tc_PolicyTypeSeq,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ CORBA::PolicyTypeSeq *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const CORBA::PolicyTypeSeq *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const CORBA::PolicyTypeSeq *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::extract (
+ _tao_any,
+ CORBA::PolicyTypeSeq::_tao_any_destructor,
+ CORBA::_tc_PolicyTypeSeq,
+ _tao_elem
+ );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+ CORBA::Any &_tao_any,
+ CORBA::SetOverrideType _tao_elem
+ )
+{
+ TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert (
+ _tao_any,
+ CORBA::_tc_SetOverrideType,
+ _tao_elem
+ );
+}
+
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ CORBA::SetOverrideType &_tao_elem
+ )
+{
+ return
+ TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
+ _tao_any,
+ CORBA::_tc_SetOverrideType,
+ _tao_elem
+ );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ CORBA::PolicyList
+ >;
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ CORBA::PolicyTypeSeq
+ >;
+
+ template class
+ TAO::Any_Basic_Impl_T<
+ CORBA::SetOverrideType
+ >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ CORBA::PolicyList \
+ >
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ CORBA::PolicyTypeSeq \
+ >
+
+# pragma instantiate \
+ TAO::Any_Basic_Impl_T< \
+ CORBA::SetOverrideType \
+ >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/Policy_ForwardA.h b/TAO/tao/Policy_ForwardA.h
new file mode 100644
index 00000000000..2deb58e4b4f
--- /dev/null
+++ b/TAO/tao/Policy_ForwardA.h
@@ -0,0 +1,68 @@
+// -*- 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_POLICY_FORWARDA_ANYOP_H_
+#define _TAO_IDL_ORIG_POLICY_FORWARDA_ANYOP_H_
+
+#include /**/ "ace/pre.h"
+
+// TAO_IDL - Generated from
+// be/be_visitor_interface_fwd/any_op_ch.cpp:65
+
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyList &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyList*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyList *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyList *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyTypeSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyTypeSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyTypeSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyTypeSeq *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_enum/any_op_ch.cpp:51
+
+TAO_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index d9ca2494fa2..e56f8e0ad37 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -26,12 +26,10 @@
// 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:338
#include "Policy_ForwardC.h"
-#include "tao/Any_Basic_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
#include "tao/Typecode.h"
#if defined (__BORLANDC__)
@@ -43,7 +41,7 @@
#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:62
// Arg traits specializations.
namespace TAO
@@ -51,24 +49,24 @@ namespace TAO
};
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_PolicyType[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
33,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x54797065),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x54797065),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
11,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795479),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795479),
ACE_NTOHL (0x70650000), // name = PolicyType
CORBA::tk_ulong,
@@ -88,8 +86,8 @@ namespace CORBA
&_tc_TAO_tc_CORBA_PolicyType;
}
-// 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 (_CORBA_POLICYLIST_CS_)
#define _CORBA_POLICYLIST_CS_
@@ -145,24 +143,24 @@ void CORBA::PolicyList::_tao_any_destructor (
#endif /* end #if !defined */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_PolicyList[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
33,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x4c697374),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x4c697374),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyList:1.0
11,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63794c69),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63794c69),
ACE_NTOHL (0x73740000), // name = PolicyList
CORBA::tk_sequence, // typecode kind
68, // encapsulation length
@@ -171,18 +169,18 @@ static const CORBA::Long _oc_CORBA_PolicyList[] =
52, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
29,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Policy:1.0
7,
- ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x506f6c69),
ACE_NTOHL (0x63790000), // name = Policy
-
+
0U,
};
@@ -201,8 +199,8 @@ namespace CORBA
&_tc_TAO_tc_CORBA_PolicyList;
}
-// 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 (_CORBA_POLICYTYPESEQ_CS_)
#define _CORBA_POLICYTYPESEQ_CS_
@@ -255,25 +253,25 @@ void CORBA::PolicyTypeSeq::_tao_any_destructor (
#endif /* end #if !defined */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x54797065),
- ACE_NTOHL (0x5365713a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x54797065),
+ ACE_NTOHL (0x5365713a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0
14,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795479),
- ACE_NTOHL (0x70655365),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795479),
+ ACE_NTOHL (0x70655365),
ACE_NTOHL (0x71000000), // name = PolicyTypeSeq
CORBA::tk_sequence, // typecode kind
80, // encapsulation length
@@ -282,18 +280,18 @@ static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
33,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x54797065),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x54797065),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
11,
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795479),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795479),
ACE_NTOHL (0x70650000), // name = PolicyType
CORBA::tk_ulong,
@@ -317,37 +315,37 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_SetOverrideType[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
38,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x744f7665),
- ACE_NTOHL (0x72726964),
- ACE_NTOHL (0x65547970),
- ACE_NTOHL (0x653a312e),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x744f7665),
+ ACE_NTOHL (0x72726964),
+ ACE_NTOHL (0x65547970),
+ ACE_NTOHL (0x653a312e),
ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0
16,
- ACE_NTOHL (0x5365744f),
- ACE_NTOHL (0x76657272),
- ACE_NTOHL (0x69646554),
+ ACE_NTOHL (0x5365744f),
+ ACE_NTOHL (0x76657272),
+ ACE_NTOHL (0x69646554),
ACE_NTOHL (0x79706500), // name = SetOverrideType
2, // member count
13,
- ACE_NTOHL (0x5345545f),
- ACE_NTOHL (0x4f564552),
- ACE_NTOHL (0x52494445),
+ ACE_NTOHL (0x5345545f),
+ ACE_NTOHL (0x4f564552),
+ ACE_NTOHL (0x52494445),
ACE_NTOHL (0x0), // name = SET_OVERRIDE
13,
- ACE_NTOHL (0x4144445f),
- ACE_NTOHL (0x4f564552),
- ACE_NTOHL (0x52494445),
+ ACE_NTOHL (0x4144445f),
+ ACE_NTOHL (0x4f564552),
+ ACE_NTOHL (0x52494445),
ACE_NTOHL (0x0), // name = ADD_OVERRIDE
};
@@ -366,151 +364,7 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const CORBA::PolicyList &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy (
- _tao_any,
- CORBA::PolicyList::_tao_any_destructor,
- CORBA::_tc_PolicyList,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- CORBA::PolicyList *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert (
- _tao_any,
- CORBA::PolicyList::_tao_any_destructor,
- CORBA::_tc_PolicyList,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- CORBA::PolicyList *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const CORBA::PolicyList *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const CORBA::PolicyList *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract (
- _tao_any,
- CORBA::PolicyList::_tao_any_destructor,
- CORBA::_tc_PolicyList,
- _tao_elem
- );
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const CORBA::PolicyTypeSeq &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert_copy (
- _tao_any,
- CORBA::PolicyTypeSeq::_tao_any_destructor,
- CORBA::_tc_PolicyTypeSeq,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- CORBA::PolicyTypeSeq *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert (
- _tao_any,
- CORBA::PolicyTypeSeq::_tao_any_destructor,
- CORBA::_tc_PolicyTypeSeq,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- CORBA::PolicyTypeSeq *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const CORBA::PolicyTypeSeq *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const CORBA::PolicyTypeSeq *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::extract (
- _tao_any,
- CORBA::PolicyTypeSeq::_tao_any_destructor,
- CORBA::_tc_PolicyTypeSeq,
- _tao_elem
- );
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
- CORBA::Any &_tao_any,
- CORBA::SetOverrideType _tao_elem
- )
-{
- TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert (
- _tao_any,
- CORBA::_tc_SetOverrideType,
- _tao_elem
- );
-}
-
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- CORBA::SetOverrideType &_tao_elem
- )
-{
- return
- TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
- _tao_any,
- CORBA::_tc_SetOverrideType,
- _tao_elem
- );
-}
-
-// 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:95
#if !defined _TAO_CDR_OP_CORBA_PolicyList_CPP_
#define _TAO_CDR_OP_CORBA_PolicyList_CPP_
@@ -521,12 +375,12 @@ CORBA::Boolean operator<< (
)
{
CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+
if (strm << _tao_seq_len)
{
// Encode all elements.
CORBA::Boolean _tao_marshal_flag = 1;
-
+
for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
{
_tao_marshal_flag =
@@ -534,10 +388,10 @@ CORBA::Boolean operator<< (
_tao_sequence[i].in (), strm
);
}
-
+
return _tao_marshal_flag;
}
-
+
return 0;
}
@@ -547,7 +401,7 @@ CORBA::Boolean operator>> (
)
{
CORBA::ULong _tao_seq_len;
-
+
if (strm >> _tao_seq_len)
{
// Add a check to the length of the sequence
@@ -557,35 +411,35 @@ CORBA::Boolean operator>> (
{
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.
CORBA::Boolean _tao_marshal_flag = 1;
-
+
for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
{
_tao_marshal_flag = (strm >> _tao_sequence[i].out ());
}
-
+
return _tao_marshal_flag;
-
+
}
-
+
return 0;
}
#endif /* _TAO_CDR_OP_CORBA_PolicyList_CPP_ */
// 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:95
#if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_
#define _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_
@@ -596,13 +450,13 @@ CORBA::Boolean operator<< (
)
{
CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+
if (strm << _tao_seq_len)
{
// Encode all elements.
return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
}
-
+
return 0;
}
@@ -612,7 +466,7 @@ CORBA::Boolean operator>> (
)
{
CORBA::ULong _tao_seq_len;
-
+
if (strm >> _tao_seq_len)
{
// Add a check to the length of the sequence
@@ -622,28 +476,28 @@ CORBA::Boolean operator>> (
{
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.
return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+
}
-
+
return 0;
}
#endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703
+// be/be_visitor_root/root.cpp:1725
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -681,8 +535,8 @@ CORBA::Boolean operator>> (
>
>;
-#if !defined (_CORBA_POLICYLIST__EXPLICIT_CS_)
-#define _CORBA_POLICYLIST__EXPLICIT_CS_
+#if !defined (_CORBA_POLICY__EXPLICIT_CS_)
+#define _CORBA_POLICY__EXPLICIT_CS_
template class
TAO_Unbounded_Object_Sequence<
@@ -693,11 +547,6 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
template class
- TAO::Any_Dual_Impl_T<
- CORBA::PolicyList
- >;
-
- template class
TAO_FixedSeq_Var_T<
CORBA::PolicyTypeSeq,
CORBA::PolicyType
@@ -716,16 +565,6 @@ CORBA::Boolean operator>> (
CORBA::PolicyType
>;
- template class
- TAO::Any_Dual_Impl_T<
- CORBA::PolicyTypeSeq
- >;
-
- template class
- TAO::Any_Basic_Impl_T<
- CORBA::SetOverrideType
- >;
-
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
# pragma instantiate \
@@ -756,8 +595,8 @@ CORBA::Boolean operator>> (
> \
>
-#if !defined (_CORBA_POLICYLIST__EXPLICIT_CS_)
-#define _CORBA_POLICYLIST__EXPLICIT_CS_
+#if !defined (_CORBA_POLICY__EXPLICIT_CS_)
+#define _CORBA_POLICY__EXPLICIT_CS_
# pragma instantiate \
TAO_Unbounded_Object_Sequence< \
@@ -768,11 +607,6 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- CORBA::PolicyList \
- >
-
-# pragma instantiate \
TAO_FixedSeq_Var_T< \
CORBA::PolicyTypeSeq, \
CORBA::PolicyType \
@@ -791,14 +625,5 @@ CORBA::Boolean operator>> (
CORBA::PolicyType \
>
-# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- CORBA::PolicyTypeSeq \
- >
-
-# pragma instantiate \
- TAO::Any_Basic_Impl_T< \
- CORBA::SetOverrideType \
-x >
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Policy_ForwardC.i b/TAO/tao/Policy_ForwardC.i
index 36653f93841..9ab3a33527f 100644
--- a/TAO/tao/Policy_ForwardC.i
+++ b/TAO/tao/Policy_ForwardC.i
@@ -27,7 +27,7 @@
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
@@ -40,7 +40,7 @@ TAO_Export CORBA::Boolean operator>> (
);
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
#if !defined _TAO_CDR_OP_CORBA_PolicyList_I_
#define _TAO_CDR_OP_CORBA_PolicyList_I_
@@ -58,7 +58,7 @@ CORBA::Boolean TAO_Export operator>> (
#endif /* _TAO_CDR_OP_CORBA_PolicyList_I_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
#if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_
#define _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_
@@ -76,7 +76,7 @@ CORBA::Boolean TAO_Export operator>> (
#endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+// be/be_visitor_enum/cdr_op_ci.cpp:51
ACE_INLINE
CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval)
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 89ec0ba0a49..fe2d2e4d4e2 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -2076,115 +2076,6 @@ namespace TAO
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Interceptor_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ForwardRequest &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ForwardRequest *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::InvalidSlot &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::InvalidSlot*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::InvalidSlot *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::InvalidSlot *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Current_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::RequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInterceptor_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInterceptor_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::IORInterceptor *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitializer_ptr &);
-
-// TAO_IDL - Generated from
// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
#ifndef __ACE_INLINE__
diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl
index 318c9a1286e..83e0672af2f 100644
--- a/TAO/tao/Services.pidl
+++ b/TAO/tao/Services.pidl
@@ -8,9 +8,8 @@
// The command used to generate code is:
//
// tao_idl
-// -o orig -Ge 1 -GT
+// -o orig -Ge 1 -GT -GA
// -Wb,export_macro=TAO_Export
-// -Wb,export_include="tao/corbafwd.h"
// -Wb,pre_include="ace/pre.h"
// -Wb,post_include="ace/post.h"
// Services.pidl
diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp
new file mode 100644
index 00000000000..4a209eb20c4
--- /dev/null
+++ b/TAO/tao/ServicesA.cpp
@@ -0,0 +1,194 @@
+// -*- 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
+
+#include "ServicesC.h"
+#include "ServicesA.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
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const CORBA::ServiceDetail &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert_copy (
+ _tao_any,
+ CORBA::ServiceDetail::_tao_any_destructor,
+ CORBA::_tc_ServiceDetail,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ CORBA::ServiceDetail *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert (
+ _tao_any,
+ CORBA::ServiceDetail::_tao_any_destructor,
+ CORBA::_tc_ServiceDetail,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ CORBA::ServiceDetail *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const CORBA::ServiceDetail *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const CORBA::ServiceDetail *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::extract (
+ _tao_any,
+ CORBA::ServiceDetail::_tao_any_destructor,
+ CORBA::_tc_ServiceDetail,
+ _tao_elem
+ );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const CORBA::ServiceInformation &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert_copy (
+ _tao_any,
+ CORBA::ServiceInformation::_tao_any_destructor,
+ CORBA::_tc_ServiceInformation,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ CORBA::ServiceInformation *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert (
+ _tao_any,
+ CORBA::ServiceInformation::_tao_any_destructor,
+ CORBA::_tc_ServiceInformation,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ CORBA::ServiceInformation *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const CORBA::ServiceInformation *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const CORBA::ServiceInformation *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::extract (
+ _tao_any,
+ CORBA::ServiceInformation::_tao_any_destructor,
+ CORBA::_tc_ServiceInformation,
+ _tao_elem
+ );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ CORBA::ServiceDetail
+ >;
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_
+ >;
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_
+ >;
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ CORBA::ServiceInformation
+ >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ CORBA::ServiceDetail \
+ >
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ \
+ >
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ \
+ >
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ CORBA::ServiceInformation \
+ >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/ServicesA.h b/TAO/tao/ServicesA.h
new file mode 100644
index 00000000000..495a2cacf27
--- /dev/null
+++ b/TAO/tao/ServicesA.h
@@ -0,0 +1,55 @@
+// -*- 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_SERVICESA_ANYOP_H_
+#define _TAO_IDL_ORIG_SERVICESA_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 CORBA::ServiceDetail &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetail *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceInformation &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index deed9fd965f..933d6c45383 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -26,12 +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:338
#include "ServicesC.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "Typecode.h"
+#include "tao/Typecode.h"
#if defined (__BORLANDC__)
#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -42,7 +41,7 @@
#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:62
// Arg traits specializations.
namespace TAO
@@ -50,7 +49,7 @@ namespace TAO
};
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_ServiceType[] =
{
@@ -88,7 +87,7 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_ServiceOption[] =
{
@@ -127,7 +126,7 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
{
@@ -168,7 +167,7 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_ServiceDetail[] =
{
@@ -264,7 +263,7 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+// be/be_visitor_structure/structure_cs.cpp:66
void
CORBA::ServiceDetail::_tao_any_destructor (
@@ -277,7 +276,7 @@ CORBA::ServiceDetail::_tao_any_destructor (
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_ServiceInformation[] =
{
@@ -437,7 +436,7 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
+// be/be_visitor_structure/structure_cs.cpp:66
void
CORBA::ServiceInformation::_tao_any_destructor (
@@ -450,7 +449,7 @@ CORBA::ServiceInformation::_tao_any_destructor (
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66
+// be/be_visitor_sequence/sequence_cs.cpp:65
#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_)
#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_
@@ -503,7 +502,7 @@ void CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_any_destruct
#endif /* end #if !defined */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66
+// be/be_visitor_sequence/sequence_cs.cpp:65
#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_)
#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_
@@ -555,124 +554,8 @@ void CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_any_destruct
#endif /* end #if !defined */
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const CORBA::ServiceDetail &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert_copy (
- _tao_any,
- CORBA::ServiceDetail::_tao_any_destructor,
- CORBA::_tc_ServiceDetail,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- CORBA::ServiceDetail *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert (
- _tao_any,
- CORBA::ServiceDetail::_tao_any_destructor,
- CORBA::_tc_ServiceDetail,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- CORBA::ServiceDetail *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const CORBA::ServiceDetail *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const CORBA::ServiceDetail *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::extract (
- _tao_any,
- CORBA::ServiceDetail::_tao_any_destructor,
- CORBA::_tc_ServiceDetail,
- _tao_elem
- );
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const CORBA::ServiceInformation &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert_copy (
- _tao_any,
- CORBA::ServiceInformation::_tao_any_destructor,
- CORBA::_tc_ServiceInformation,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- CORBA::ServiceInformation *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert (
- _tao_any,
- CORBA::ServiceInformation::_tao_any_destructor,
- CORBA::_tc_ServiceInformation,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- CORBA::ServiceInformation *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const CORBA::ServiceInformation *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const CORBA::ServiceInformation *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::extract (
- _tao_any,
- CORBA::ServiceInformation::_tao_any_destructor,
- CORBA::_tc_ServiceInformation,
- _tao_elem
- );
-}
-
// 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:95
#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__CPP_
#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__CPP_
@@ -730,7 +613,7 @@ CORBA::Boolean operator>> (
#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__CPP_ */
// 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:95
#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__CPP_
#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__CPP_
@@ -802,7 +685,7 @@ CORBA::Boolean operator>> (
#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__CPP_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703
+// be/be_visitor_root/root.cpp:1725
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -822,13 +705,8 @@ CORBA::Boolean operator>> (
CORBA::ServiceDetail_var
>;
- template class
- TAO::Any_Dual_Impl_T<
- CORBA::ServiceDetail
- >;
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_
+#if !defined (_CORBA_ULONG__EXPLICIT_CS_)
+#define _CORBA_ULONG__EXPLICIT_CS_
template class
TAO_Unbounded_Sequence<
@@ -837,13 +715,8 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
- template class
- TAO::Any_Dual_Impl_T<
- CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_
- >;
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_
+#if !defined (_CORBA_SERVICEDETAIL__EXPLICIT_CS_)
+#define _CORBA_SERVICEDETAIL__EXPLICIT_CS_
template class
TAO_Unbounded_Sequence<
@@ -853,11 +726,6 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
template class
- TAO::Any_Dual_Impl_T<
- CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_
- >;
-
- template class
TAO_Var_Var_T<
CORBA::ServiceInformation
>;
@@ -873,11 +741,6 @@ CORBA::Boolean operator>> (
CORBA::ServiceInformation_var
>;
- template class
- TAO::Any_Dual_Impl_T<
- CORBA::ServiceInformation
- >;
-
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
# pragma instantiate \
@@ -896,13 +759,8 @@ CORBA::Boolean operator>> (
CORBA::ServiceDetail_var \
>
-# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- CORBA::ServiceDetail \
- >
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_
+#if !defined (_CORBA_ULONG__EXPLICIT_CS_)
+#define _CORBA_ULONG__EXPLICIT_CS_
# pragma instantiate \
TAO_Unbounded_Sequence< \
@@ -911,13 +769,8 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
-# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ \
- >
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_
+#if !defined (_CORBA_SERVICEDETAIL__EXPLICIT_CS_)
+#define _CORBA_SERVICEDETAIL__EXPLICIT_CS_
# pragma instantiate \
TAO_Unbounded_Sequence< \
@@ -927,11 +780,6 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ \
- >
-
-# pragma instantiate \
TAO_Var_Var_T< \
CORBA::ServiceInformation \
>
@@ -947,10 +795,5 @@ CORBA::Boolean operator>> (
CORBA::ServiceInformation_var \
>
-# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- CORBA::ServiceInformation \
- >
-
#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ServicesC.i b/TAO/tao/ServicesC.i
index 20dcb9ed7f7..cdb10411ff4 100644
--- a/TAO/tao/ServicesC.i
+++ b/TAO/tao/ServicesC.i
@@ -27,7 +27,7 @@
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
+// be/be_visitor_structure/cdr_op_ci.cpp:70
ACE_INLINE
CORBA::Boolean operator<< (
@@ -52,7 +52,7 @@ CORBA::Boolean operator>> (
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__I_
#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__I_
@@ -70,7 +70,7 @@ CORBA::Boolean TAO_Export operator>> (
#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__I_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__I_
#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__I_
@@ -88,7 +88,7 @@ CORBA::Boolean TAO_Export operator>> (
#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__I_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
+// be/be_visitor_structure/cdr_op_ci.cpp:70
ACE_INLINE
CORBA::Boolean operator<< (
diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl
index dbba774cd09..f8f10ef2a05 100644
--- a/TAO/tao/StringSeq.pidl
+++ b/TAO/tao/StringSeq.pidl
@@ -8,9 +8,8 @@
// The command used to generate code is:
//
// tao_idl
-// -o orig -Ge 1 -GT
+// -o orig -Ge 1 -GT -GA
// -Wb,export_macro=TAO_Export
-// -Wb,export_include="tao/corbafwd.h"
// -Wb,pre_include="ace/pre.h"
// -Wb,post_include="ace/post.h"
// StringSeq.pidl
diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp
new file mode 100644
index 00000000000..ddc5f40c0df
--- /dev/null
+++ b/TAO/tao/StringSeqA.cpp
@@ -0,0 +1,174 @@
+// -*- 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
+
+#include "StringSeqC.h"
+#include "StringSeqA.h"
+#include "tao/Typecode.h"
+#include "tao/Any_Dual_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const CORBA::StringSeq &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert_copy (
+ _tao_any,
+ CORBA::StringSeq::_tao_any_destructor,
+ CORBA::_tc_StringSeq,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ CORBA::StringSeq *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert (
+ _tao_any,
+ CORBA::StringSeq::_tao_any_destructor,
+ CORBA::_tc_StringSeq,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ CORBA::StringSeq *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const CORBA::StringSeq *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const CORBA::StringSeq *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<CORBA::StringSeq>::extract (
+ _tao_any,
+ CORBA::StringSeq::_tao_any_destructor,
+ CORBA::_tc_StringSeq,
+ _tao_elem
+ );
+}
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ const CORBA::WStringSeq &_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert_copy (
+ _tao_any,
+ CORBA::WStringSeq::_tao_any_destructor,
+ CORBA::_tc_WStringSeq,
+ _tao_elem
+ );
+}
+
+// Non-copying insertion.
+void operator<<= (
+ CORBA::Any &_tao_any,
+ CORBA::WStringSeq *_tao_elem
+ )
+{
+ TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert (
+ _tao_any,
+ CORBA::WStringSeq::_tao_any_destructor,
+ CORBA::_tc_WStringSeq,
+ _tao_elem
+ );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ CORBA::WStringSeq *&_tao_elem
+ )
+{
+ return _tao_any >>= ACE_const_cast (
+ const CORBA::WStringSeq *&,
+ _tao_elem
+ );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+ const CORBA::Any &_tao_any,
+ const CORBA::WStringSeq *&_tao_elem
+ )
+{
+ return
+ TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::extract (
+ _tao_any,
+ CORBA::WStringSeq::_tao_any_destructor,
+ CORBA::_tc_WStringSeq,
+ _tao_elem
+ );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ CORBA::StringSeq
+ >;
+
+ template class
+ TAO::Any_Dual_Impl_T<
+ CORBA::WStringSeq
+ >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ CORBA::StringSeq \
+ >
+
+# pragma instantiate \
+ TAO::Any_Dual_Impl_T< \
+ CORBA::WStringSeq \
+ >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/StringSeqA.h b/TAO/tao/StringSeqA.h
new file mode 100644
index 00000000000..5e43ea5b7ee
--- /dev/null
+++ b/TAO/tao/StringSeqA.h
@@ -0,0 +1,55 @@
+// -*- 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_STRINGSEQA_ANYOP_H_
+#define _TAO_IDL_ORIG_STRINGSEQA_ANYOP_H_
+
+#include /**/ "ace/pre.h"
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
+
+// TAO_IDL - Generated from
+// be/be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 72dc64ae1dd..4d61336efb1 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -26,12 +26,12 @@
// 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:338
#include "StringSeqC.h"
-#include "Any_Dual_Impl_T.h"
-#include "Typecode.h"
+#include "tao/Typecode.h"
+#include "CDR.h"
#if defined (__BORLANDC__)
#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -42,7 +42,7 @@
#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:62
// Arg traits specializations.
namespace TAO
@@ -50,7 +50,7 @@ namespace TAO
};
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66
+// be/be_visitor_sequence/sequence_cs.cpp:65
#if !defined (_CORBA_STRINGSEQ_CS_)
#define _CORBA_STRINGSEQ_CS_
@@ -97,7 +97,7 @@ void CORBA::StringSeq::_tao_any_destructor (
#endif /* end #if !defined */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_StringSeq[] =
{
@@ -139,7 +139,7 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66
+// be/be_visitor_sequence/sequence_cs.cpp:65
#if !defined (_CORBA_WSTRINGSEQ_CS_)
#define _CORBA_WSTRINGSEQ_CS_
@@ -186,7 +186,7 @@ void CORBA::WStringSeq::_tao_any_destructor (
#endif /* end #if !defined */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// be/be_visitor_typecode/typecode_defn.cpp:284
static const CORBA::Long _oc_CORBA_WStringSeq[] =
{
@@ -228,124 +228,8 @@ namespace CORBA
&_tc_TAO_tc_CORBA_WStringSeq;
}
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const CORBA::StringSeq &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert_copy (
- _tao_any,
- CORBA::StringSeq::_tao_any_destructor,
- CORBA::_tc_StringSeq,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- CORBA::StringSeq *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert (
- _tao_any,
- CORBA::StringSeq::_tao_any_destructor,
- CORBA::_tc_StringSeq,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- CORBA::StringSeq *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const CORBA::StringSeq *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const CORBA::StringSeq *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<CORBA::StringSeq>::extract (
- _tao_any,
- CORBA::StringSeq::_tao_any_destructor,
- CORBA::_tc_StringSeq,
- _tao_elem
- );
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- const CORBA::WStringSeq &_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert_copy (
- _tao_any,
- CORBA::WStringSeq::_tao_any_destructor,
- CORBA::_tc_WStringSeq,
- _tao_elem
- );
-}
-
-// Non-copying insertion.
-void operator<<= (
- CORBA::Any &_tao_any,
- CORBA::WStringSeq *_tao_elem
- )
-{
- TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert (
- _tao_any,
- CORBA::WStringSeq::_tao_any_destructor,
- CORBA::_tc_WStringSeq,
- _tao_elem
- );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- CORBA::WStringSeq *&_tao_elem
- )
-{
- return _tao_any >>= ACE_const_cast (
- const CORBA::WStringSeq *&,
- _tao_elem
- );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
- const CORBA::Any &_tao_any,
- const CORBA::WStringSeq *&_tao_elem
- )
-{
- return
- TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::extract (
- _tao_any,
- CORBA::WStringSeq::_tao_any_destructor,
- CORBA::_tc_WStringSeq,
- _tao_elem
- );
-}
-
// 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:95
#if !defined _TAO_CDR_OP_CORBA_StringSeq_CPP_
#define _TAO_CDR_OP_CORBA_StringSeq_CPP_
@@ -418,7 +302,7 @@ return 0;
#endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */
// 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:95
#if !defined _TAO_CDR_OP_CORBA_WStringSeq_CPP_
#define _TAO_CDR_OP_CORBA_WStringSeq_CPP_
@@ -491,7 +375,7 @@ return 0;
#endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703
+// be/be_visitor_root/root.cpp:1725
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -515,11 +399,6 @@ return 0;
>;
template class
- TAO::Any_Dual_Impl_T<
- CORBA::StringSeq
- >;
-
- template class
TAO_MngSeq_Var_T<
CORBA::WStringSeq,
TAO_SeqElem_WString_Manager
@@ -538,11 +417,6 @@ return 0;
TAO_SeqElem_WString_Manager
>;
- template class
- TAO::Any_Dual_Impl_T<
- CORBA::WStringSeq
- >;
-
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
# pragma instantiate \
@@ -565,11 +439,6 @@ return 0;
>
# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- CORBA::StringSeq \
- >
-
-# pragma instantiate \
TAO_MngSeq_Var_T< \
CORBA::WStringSeq, \
TAO_SeqElem_WString_Manager \
@@ -588,10 +457,5 @@ return 0;
TAO_SeqElem_WString_Manager \
>
-# pragma instantiate \
- TAO::Any_Dual_Impl_T< \
- CORBA::WStringSeq \
- >
-
#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index d223e25ec23..252bc02831b 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -26,14 +26,14 @@
// 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:186
#ifndef _TAO_IDL_ORIG_STRINGSEQC_H_
#define _TAO_IDL_ORIG_STRINGSEQC_H_
#include /**/ "ace/pre.h"
-#include "Sequence.h"
+#include "tao/Sequence.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -66,13 +66,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 CORBA
{
// 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 (_CORBA_STRINGSEQ_CH_)
#define _CORBA_STRINGSEQ_CH_
@@ -118,12 +118,12 @@ namespace CORBA
#endif /* end #if !defined */
// TAO_IDL - Generated from
- // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+ // be/be_visitor_typecode/typecode_decl.cpp:44
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringSeq;
// 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 (_CORBA_WSTRINGSEQ_CH_)
#define _CORBA_WSTRINGSEQ_CH_
@@ -169,17 +169,17 @@ namespace CORBA
#endif /* end #if !defined */
// TAO_IDL - Generated from
- // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+ // be/be_visitor_typecode/typecode_decl.cpp:44
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WStringSeq;
// 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 CORBA
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
+// be/be_visitor_traits.cpp:50
// Traits specializations.
namespace TAO
@@ -187,28 +187,12 @@ namespace TAO
};
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+// 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:70
#if !defined _TAO_CDR_OP_CORBA_StringSeq_H_
#define _TAO_CDR_OP_CORBA_StringSeq_H_
@@ -225,7 +209,7 @@ TAO_Export CORBA::Boolean operator>> (
#endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
// 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:70
#if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_
#define _TAO_CDR_OP_CORBA_WStringSeq_H_
@@ -242,12 +226,12 @@ TAO_Export CORBA::Boolean operator>> (
#endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+// 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:1050
#if defined (__ACE_INLINE__)
#include "StringSeqC.i"
@@ -262,5 +246,6 @@ TAO_Export CORBA::Boolean operator>> (
#endif /* __BORLANDC__ */
#include /**/ "ace/post.h"
+
#endif /* ifndef */
diff --git a/TAO/tao/StringSeqC.i b/TAO/tao/StringSeqC.i
index ba85b518ce7..03858b739e8 100644
--- a/TAO/tao/StringSeqC.i
+++ b/TAO/tao/StringSeqC.i
@@ -27,7 +27,7 @@
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
#if !defined _TAO_CDR_OP_CORBA_StringSeq_I_
#define _TAO_CDR_OP_CORBA_StringSeq_I_
@@ -45,7 +45,7 @@ CORBA::Boolean TAO_Export operator>> (
#endif /* _TAO_CDR_OP_CORBA_StringSeq_I_ */
// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// be/be_visitor_sequence/cdr_op_ci.cpp:81
#if !defined _TAO_CDR_OP_CORBA_WStringSeq_I_
#define _TAO_CDR_OP_CORBA_WStringSeq_I_
diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl
index 5f1b3c795e3..3912d55bb65 100644
--- a/TAO/tao/TAO.pidl
+++ b/TAO/tao/TAO.pidl
@@ -15,7 +15,7 @@
* this is:
*
* tao_idl
- * -o orig -Gp -Gd -Ge 1 -GT
+ * -o orig -Gp -Gd -Ge 1 -GT -GA
* -Wb,export_macro=TAO_Export
* -Wb,pre_include="ace/pre.h"
* -Wb,post_include="ace/post.h"
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index d17d094018a..86c7a06dc11 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -85,6 +85,7 @@ project(TAO) : acelib, taoversion, core, tao_output, extra_core {
ObjectIdListC.cpp
ORB.cpp
Policy_ForwardC.cpp
+ Policy_ForwardA.cpp
PolicyC.cpp
PolicyA.cpp
Policy_Validator.cpp
@@ -127,6 +128,7 @@ project(TAO) : acelib, taoversion, core, tao_output, extra_core {
PICurrent.cpp
PICurrent_ORBInitializer.cpp
DynamicC.cpp
+ DynamicA.cpp
Dynamic_ParameterC.cpp
ParameterMode.cpp
OctetSeqC.cpp