xfer to laptop

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

diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc
index c634ceebf59bf674abe07f6a9ffde035233989ed..12cb65c503e3a166fcdb8e66002af58f809c5c3c 100644 (file)
--- a/idlcomp/languages/c++/main.cc
+++ b/idlcomp/languages/c++/main.cc
@@ -2,23 +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 condition:
+// 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.
 // 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// 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
 
@@ -393,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++) {
@@ -491,7 +481,10 @@ void CPPFile::output_vstruct_info(Struct *sym)
        file << indent << "};\n\n"
             << indent << "static const __attribute__((unused)) "
                          "::System::RunTime::VStructInfo _info = {\n"
-            << indent << "\t_guids, " << sym->chainlen << '\n'
+            << indent << "\t_guids, " << sym->chainlen << ",\n"
+#if 0
+            << indent << "\t_marshall, _unmarshall,\n"
+#endif
             << indent << "};\n";
 
        
@@ -745,8 +738,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)