Remove weak from downcast method.

It makes no sense with inline functions.

Signed-off-by: Scott Wood <scott@buserror.net>

diff --git a/idlcomp/languages/c++/interface-caller.cc b/idlcomp/languages/c++/interface-caller.cc
index 0f0d139985d53d771ee143fe43fdc0f4a6a89298..556293a4630951e9fa3a6aebf572fa96dc7284ce 100644 (file)
--- a/idlcomp/languages/c++/interface-caller.cc
+++ b/idlcomp/languages/c++/interface-caller.cc
@@ -260,7 +260,7 @@ void CPPFile::output_internal(Interface *iface)
 
 void CPPFile::output_downcast_proto(Interface *iface, Interface *super)
 {
 
 void CPPFile::output_downcast_proto(Interface *iface, Interface *super)
 {

-       file << '\n' << indent << "static __attribute__((weak)) inline "
+       file << '\n' << indent << "static inline "

             << **iface->name << " downcast(";
        cpp_output_type(file, super, false, false);
        file << "oldptr);\n";
             << **iface->name << " downcast(";
        cpp_output_type(file, super, false, false);
        file << "oldptr);\n";

diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc
index 3e921e5eb94f9a236381ca76535380faed9fa9b2..3157a5597e3b7369d510c2cc18e7dfa3fb93d640 100644 (file)
--- a/idlcomp/languages/c++/main.cc
+++ b/idlcomp/languages/c++/main.cc
@@ -527,7 +527,7 @@ void CPPFile::output_vstruct_main(Struct *sym)
 
        if (super)
                file << '\n'
 
        if (super)
                file << '\n'

-                    << indent << "static __attribute__((weak)) " << name << " *downcast(::System::VStruct *base)\n"
+                    << indent << "static " << name << " *downcast(::System::VStruct *base)\n"

                     << indent << "{\n"
                     << indent << "\tif (!base)\n"
                     << indent << "\t\treturn NULL;\n\n"
                     << indent << "{\n"
                     << indent << "\tif (!base)\n"
                     << indent << "\t\treturn NULL;\n\n"