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=cfdb16b82ff03cd475fb8ce6a2bb63ff54688190;hb=5adc890ffae4f90536e72bc32ef83e1141689520;hpb=7da27a216a7f4bb3331fe315cdbec69bfcf2c762

diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc
index cfdb16b..7c6ebe8 100644
--- a/idlcomp/languages/c++/main.cc
+++ b/idlcomp/languages/c++/main.cc
@@ -2,31 +2,15 @@
 //
 // This software is copyright (c) 2006 Scott Wood <scott@buserror.net>.
 // 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal with
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors or contributors be held liable for any damages
+// arising from the use of this software.
 // 
-//     * Redistributions of source code must retain the above copyright notice,
-//       this list of conditions and the following disclaimers.
-// 
-//     * Redistributions in binary form must reproduce the above copyright notice,
-//       this list of conditions and the following disclaimers in the
-//       documentation and/or other materials provided with the distribution.
-// 
-//     * The names of the Software's authors and/or contributors
-//       may not be used to endorse or promote products derived from
-//       this Software without specific prior written permission.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-// CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-// SOFTWARE.
+// Permission is hereby granted to everyone, free of charge, to use, copy,
+// modify, prepare derivative works of, publish, distribute, perform,
+// sublicense, and/or sell copies of the Software, provided that the above
+// copyright notice and disclaimer of warranty be included in all copies or
+// substantial portions of this software.
 
 // FIXME: escape C++ reserved words
 
@@ -401,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++) {
@@ -753,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)