X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=idlcomp%2Flanguages%2Fc%2B%2B%2Fmain.cc;h=ab4289c596e5c3dee5e3af14e35d0c00e6ef9d47;hb=cc1bee96fd874ff2c85c765f81ec2f4ba4584b9d;hp=8fb4b7259dd1f23351f7be5e1109ab33157167eb;hpb=78b14d860d585f77a7e88a829629ebadd862cb1b;p=polintos%2Fscott%2Fpriv.git

diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc
index 8fb4b72..ab4289c 100644
--- a/idlcomp/languages/c++/main.cc
+++ b/idlcomp/languages/c++/main.cc
@@ -259,7 +259,7 @@ void cpp_output_type(ostream &file, Type *t, bool array, bool is_mutable)
 	cpp_output_name(file, t);
 
 	if (array)
-		file << ">";
+		file << ", ::System::RunTime::ORBMM>";
 
 	file << ' ';
 }
@@ -293,7 +293,7 @@ void cpp_output_type(ostream &file, CompiledBasicType &t, bool is_mutable)
 	}
 	
 	if (is_array(t))
-		file << '>';
+		file << ", ::System::RunTime::ORBMM>";
 	
 	file << ' ';
 }
@@ -385,7 +385,7 @@ void CPPFile::output_guid(const uint64_t *guid64)
 	const unsigned char *guid = reinterpret_cast<const unsigned char *>(guid64);
 	char guidhex[7];
 	
-	file << indent << "static const __attribute__((unused))\n"
+	file << indent << "__attribute__((weak))\n"
 	     << indent << "::System::RunTime::GUID _guid = {\n"
 	     << indent << "\t{ ";
 	
@@ -459,8 +459,8 @@ void CPPFile::output_vstruct_info(Struct *sym)
 {
 	all_ns_in(sym, true, "VINFO_");
 
-	file << indent << "static const __attribute__((unused)) "
-	                  "unsigned long *const _guids[] = {\n";
+	file << indent << "__attribute__((weak)) "
+	                  "unsigned long * _guids[] = {\n";
 	
 	stack<StructRef> supers;
 	sym->chainlen = 0;
@@ -480,12 +480,10 @@ void CPPFile::output_vstruct_info(Struct *sym)
 	}
 
 	file << indent << "};\n\n"
-	     << indent << "static const __attribute__((unused)) "
+	     << indent << "__attribute__((weak)) "
 	                  "::System::RunTime::VStructInfo _info = {\n"
 	     << indent << "\t_guids, " << sym->chainlen << ",\n"
-#if 0
-	     << indent << "\t_marshall, _unmarshall,\n"
-#endif
+//	     << indent << "\t_marshall, _unmarshall,\n"
 	     << indent << "};\n";
 
 	
@@ -521,7 +519,7 @@ void CPPFile::output_vstruct_main(Struct *sym)
 
 	if (super)
 		file << '\n'
-		     << indent << "static " << name << " *downcast(::System::VStruct *base)\n"
+		     << indent << "static __attribute__((weak)) " << name << " *downcast(::System::VStruct *base)\n"
 		     << indent << "{\n"
 		     << indent << "\tif (!base)\n"
 		     << indent << "\t\treturn NULL;\n\n"
@@ -642,9 +640,13 @@ void CPPFile::output(Struct *sym, int pass, void *arg2)
 				output_nsdecl_begin(sym);
 				output_nsdecl_children(sym);
 				output_guid(sym->def.guid);
+				output_marshall(sym, trav_nsdecl);
 				output_nsdecl_end(sym);
 			} else {
-				output_nsdecl(sym);
+				output_nsdecl_begin(sym);
+				output_nsdecl_children(sym);
+				output_marshall(sym, trav_nsdecl);
+				output_nsdecl_end(sym);
 			}
 
 			break;