X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=idlcomp%2Flanguages%2Fc%2B%2B%2Fmain.cc;h=7c6ebe8243e27fe00ab3d002b1f7348502402f35;hp=813bff394f040f3cd2dcacd5892fb03422d18b1e;hb=5adc890ffae4f90536e72bc32ef83e1141689520;hpb=f8bdc6f9e7106aa7786ee19269ab9a2e4c307476

diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc
index 813bff3..7c6ebe8 100644
--- a/idlcomp/languages/c++/main.cc
+++ b/idlcomp/languages/c++/main.cc
@@ -385,10 +385,8 @@ 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)) union {\n"
-	     << indent << "\tunsigned char c[16];\n"
-	     << indent << "\tunsigned long l[];\n"
-	     << indent << "} _guid = {\n"
+	file << indent << "static const __attribute__((unused))\n"
+	     << indent << "::System::RunTime::GUID _guid = {\n"
 	     << indent << "\t{ ";
 	
 	for (int i = 0; i < 16; i++) {
@@ -737,8 +735,9 @@ void CPPFile::output_iface_ns(CPPFile *file, NameSpace *sym)
 {
 	Interface *i = dynamic_cast<Interface *>(sym);
 	assert(i);
-	
+
 	file->output_guid(i->def.guid);
+	file->output_ifaceinfo(i);
 }
 
 void CPPFile::output(Interface *sym, int pass, void *arg2)