diff options
Diffstat (limited to 'idlc/c_gen/c_proxy_header_gen.cc')
| -rw-r--r-- | idlc/c_gen/c_proxy_header_gen.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/idlc/c_gen/c_proxy_header_gen.cc b/idlc/c_gen/c_proxy_header_gen.cc index 5548963..13de012 100644 --- a/idlc/c_gen/c_proxy_header_gen.cc +++ b/idlc/c_gen/c_proxy_header_gen.cc @@ -62,7 +62,7 @@ void CProxyHeaderGen::GenInterfaceDelegators(std::ofstream& stream, for (auto& i : inf.GetDeclarations().GetDecls()) { if (i->GetMethodType() != Declaration::MethodType::DELEGATE) continue; - GenInterfaceDelegator(stream, inf.GetID(), *i); + GenInterfaceDelegator(stream, GetInterfaceIdWithNamespace(inf), *i); } } @@ -108,7 +108,7 @@ void CProxyHeaderGen::GenInterfaceDelegator(std::ofstream& stream, void CProxyHeaderGen::GenInterfaceDeclaration(std::ofstream& stream, const Interface& inf) { - stream << SmartIndent(ReplaceAll(CB_INTERFACE_DECL, "##", inf.GetID())); + stream << SmartIndent(ReplaceAll(CB_INTERFACE_DECL, "##", GetInterfaceIdWithNamespace(inf))); } void CProxyHeaderGen::GenInterfaceMethods(std::ofstream& stream, @@ -117,7 +117,7 @@ void CProxyHeaderGen::GenInterfaceMethods(std::ofstream& stream, if (i->GetMethodType() == Declaration::MethodType::DELEGATE) continue; stream << GenTemplateString( - ReplaceAll(CB_INTERFACE_METHODS, "##", inf.GetID()), + ReplaceAll(CB_INTERFACE_METHODS, "##", GetInterfaceIdWithNamespace(inf)), [&]()->std::string { return GetReturnTypeString(i->GetType()); }, @@ -129,7 +129,7 @@ void CProxyHeaderGen::GenInterfaceMethods(std::ofstream& stream, for (auto& p : i->GetParameters().GetParams()) { str += ", "; if (TypeIsDelegator(inf, p->GetParameterType().GetBaseType())) { - str += "rpc_port_" + inf.GetID() + "_" + + str += "rpc_port_" + GetInterfaceIdWithNamespace(inf) + "_" + p->GetParameterType().GetBaseType().ToString() + "_h " + p->GetID(); } else { @@ -145,12 +145,12 @@ void CProxyHeaderGen::GenInterfaceMethods(std::ofstream& stream, void CProxyHeaderGen::GenInterfaceConnect(std::ofstream& stream, const Interface& inf) { - stream << ReplaceAll(CB_INTERFACE_CONNECT, "##", inf.GetID()); + stream << ReplaceAll(CB_INTERFACE_CONNECT, "##", GetInterfaceIdWithNamespace(inf)); } void CProxyHeaderGen::GenInterfaceDisconnect(std::ofstream& stream, const Interface& inf) { - stream << ReplaceAll(CB_INTERFACE_DISCONNECT, "##", inf.GetID()); + stream << ReplaceAll(CB_INTERFACE_DISCONNECT, "##", GetInterfaceIdWithNamespace(inf)); } } // namespace tidl |