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 4d17670e0c62ebd7f38eb5350d672f6f2c85a94a..556293a4630951e9fa3a6aebf572fa96dc7284ce 100644 (file)
--- a/idlcomp/languages/c++/interface-caller.cc
+++ b/idlcomp/languages/c++/interface-caller.cc
@@ -260,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";
 }
@@ -283,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--;