summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-12 03:02:33 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-12 03:02:33 +0000
commit40f6de197800d0b2e39a3d9d568f2a658e4f5a9c (patch)
tree0e47147c4709437aac3778958ea760a17e828328
parent9341db4ee6455e809bb738c80cba268f62aeac96 (diff)
downloadATCD-40f6de197800d0b2e39a3d9d568f2a658e4f5a9c.tar.gz
ChangeLogTag: Fri Apr 11 21:50:43 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog_ref5
-rw-r--r--TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp8
-rw-r--r--TAO/tao/Array_VarOut_T.h2
-rw-r--r--TAO/tao/Array_VarOut_T.inl8
-rw-r--r--TAO/tao/TAO.dsp13
6 files changed, 38 insertions, 0 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 626db49d090..34cc8288f19 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -15,6 +15,11 @@ Fri Apr 11 21:50:43 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
by the changes above) visible to the Any impl class
TAO_Any_Array_Impl_T<>, where it is used in extraction.
+ * tao/TAO.dsp:
+
+ Added new generated files IOP_IORC.* and IOP_CodecC.* to the
+ project.
+
Fri Apr 11 14:41:11 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* Merged with the main trunk and compiled the core ORB and the IDL
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index 43ad8f65b76..2d4bf035662 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -204,6 +204,8 @@ int be_visitor_array_ch::visit_array (be_array *node)
<< "struct " << be_global->stub_export_macro ()
<< " tao_" << node->local_name () << "_life" << be_nl
<< "{" << be_idt_nl
+ << "static " << anon_p << node->local_name ()
+ << "_slice * tao_alloc (void);" << be_nl
<< "static void tao_free (" << anon_p << node->local_name ()
<< "_slice * _tao_slice);" << be_nl
<< "static " << anon_p << node->local_name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index 332d652f901..44deb5b26df 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -192,6 +192,14 @@ int be_visitor_array_ci::visit_array (be_array *node)
<< fname << "_copy (_tao_to, _tao_from);" << be_uidt_nl
<< "}";
+ *os << be_nl << be_nl
+ << "ACE_INLINE" << be_nl
+ << fname << "_slice *" << be_nl
+ << node->fwd_helper_name () << "_life::tao_alloc (void)" << be_nl
+ << "{" << be_idt_nl
+ << "return " << fname << "_alloc ();" << be_uidt_nl
+ << "}";
+
node->cli_inline_gen (1);
return 0;
}
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
index 0e9fd9ffe9e..17575b6f54a 100644
--- a/TAO/tao/Array_VarOut_T.h
+++ b/TAO/tao/Array_VarOut_T.h
@@ -159,6 +159,8 @@ public:
T_slice * _retn (void);
T_slice * ptr (void) const;
CORBA::Boolean nocopy (void) const;
+
+ static T_slice * tao_alloc (void);
private:
T_slice * ptr_;
CORBA::Boolean nocopy_;
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
index 3f2c2622492..c5b1c141e32 100644
--- a/TAO/tao/Array_VarOut_T.inl
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -359,3 +359,11 @@ TAO_Array_Forany_T<T_slice,T_life>::nocopy (void) const
return this->nocopy_;
}
+template<typename T_slice, typename T_life>
+ACE_INLINE
+T_slice *
+TAO_Array_Forany_T<T_slice,T_life>::tao_alloc (void)
+{
+ return T_life::tao_alloc ();
+}
+
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index dedc256bfc6..d97359b7037 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -528,6 +528,11 @@ SOURCE=.\Invocation_Endpoint_Selectors.cpp
# End Source File
# Begin Source File
+SOURCE=.\IOP_IORC.cpp
+# ADD CPP /GR
+# End Source File
+# Begin Source File
+
SOURCE=.\IOPC.cpp
# ADD CPP /GR
# End Source File
@@ -1379,6 +1384,10 @@ SOURCE=.\Invocation_Endpoint_Selectors.h
# End Source File
# Begin Source File
+SOURCE=.\IOP_IORC.h
+# End Source File
+# Begin Source File
+
SOURCE=.\IOPC.h
# End Source File
# Begin Source File
@@ -2159,6 +2168,10 @@ SOURCE=.\Invocation_Endpoint_Selectors.i
# End Source File
# Begin Source File
+SOURCE=.\IOP_IORC.i
+# End Source File
+# Begin Source File
+
SOURCE=.\IOPC.i
# End Source File
# Begin Source File