Move arrays to Util namespace, add parametric allocator.

[polintos/scott/priv.git] / idlcomp / languages / c++ / marshall.cc

diff --git a/idlcomp/languages/c++/marshall.cc b/idlcomp/languages/c++/marshall.cc
index 6deb115ad7f2842a10c7a6accc6db0356456d7f2..bd1f4286f0f6a6ceb84278f60bf45f42449e7e35 100644 (file)
--- a/idlcomp/languages/c++/marshall.cc
+++ b/idlcomp/languages/c++/marshall.cc
@@ -39,14 +39,14 @@ void CPPFile::output_marshall(Struct *sym, int pass)
                case trav_nsdecl:
                        extra_newline();
                        
-                       file << indent << "int _marshall(::System::RunTime::GrowableArray<uint8_t> &buf,\n"
-                            << indent << "              ::System::RunTime::GrowableArray< ::System::RunTime::ID> &objlist,\n"
-                            << indent << "              ::System::RunTime::GrowableArray< ::System::RunTime::NewObject> &newobjlist,\n"
+                       file << indent << "int _marshall(::System::RunTime::GrowableArray<uint8_t, ::System::RunTime::ORBMM> &buf,\n"
+                            << indent << "              ::System::RunTime::GrowableArray< ::System::RunTime::ID, ::System::RunTime::ORBMM> &objlist,\n"
+                            << indent << "              ::System::RunTime::GrowableArray< ::System::RunTime::NewObject, ::System::RunTime::ORBMM> &newobjlist,\n"
                             << indent << "              ::System::RunTime::ParamInfoBlock::Segment *segs,\n"
                             << indent << "              int nsegs);\n";
 
-                       file << indent << "void _unmarshall(::System::RunTime::Array<uint8_t> buf,\n"
-                            << indent << "                 ::System::RunTime::Array< ::System::_i_Object *> objlist,\n"
+                       file << indent << "void _unmarshall(::System::RunTime::Array<uint8_t, ::System::RunTime::ORBMM> buf,\n"
+                            << indent << "                 ::System::RunTime::Array< ::System::_i_Object *, ::System::RunTime::ORBMM> objlist,\n"
                             << indent << "                 ::System::RunTime::ParamInfoBlock::Segment *segs,\n"
                             << indent << "                 int nsegs);\n";