Remove weak from downcast method.

[polintos/scott/priv.git] / idlcomp / languages / c++ / interface-caller.cc

diff --git a/idlcomp/languages/c++/interface-caller.cc b/idlcomp/languages/c++/interface-caller.cc
index c6e87a1f3a447252a63511bea540a5322978d7ef..556293a4630951e9fa3a6aebf572fa96dc7284ce 100644 (file)
--- a/idlcomp/languages/c++/interface-caller.cc
+++ b/idlcomp/languages/c++/interface-caller.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.
 
 #include <targets.h>
 #include "c++.h"
@@ -276,7 +260,8 @@ void CPPFile::output_internal(Interface *iface)
 
 void CPPFile::output_downcast_proto(Interface *iface, Interface *super)
 {
-       file << '\n' << indent << "static inline " << **iface->name << " downcast(";
+       file << '\n' << indent << "static inline "
+            << **iface->name << " downcast(";
        cpp_output_type(file, super, false, false);
        file << "oldptr);\n";
 }
@@ -299,8 +284,8 @@ void CPPFile::output_downcast(Interface *iface, Interface *super)
             << indent << "\treinterpret_cast< ::System::_i_Object *>(oldptr._ptr);\n"
             << indent << "return " << name << "(reinterpret_cast< "
             << iname << " *>\n"
-            << indent << "\t(::System::RunTime::downcast(_llptr, " 
-            << name << "_ns::_guid.l)));\n";
+            << indent << "\t(::System::RunTime::downcast(_llptr, &"
+            << name << "_ns::_guid)));\n";
        
        indent.indent_level--;