Skip to content

Commit

Permalink
fix: name conflict and GetGlobalOperator
Browse files Browse the repository at this point in the history
  • Loading branch information
Vipul-Cariappa authored and aaronj0 committed Sep 30, 2024
1 parent 7ee7774 commit 1df4a33
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion clingwrapper/src/clingwrapper.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ bool Cppyy::AppendTypesSlow(const std::string &name,
if (!struct_count)
Cpp::Declare(code.c_str()); // initialize the trampoline

std::string var = "__s" + std::to_string(struct_count++);
std::string var = "__Cppyy_s" + std::to_string(struct_count++);
// FIXME: We cannot use silent because it erases our error code from Declare!
if (!Cpp::Declare(("__Cppyy_AppendTypesSlow<" + name + "> " + var +";\n").c_str(), /*silent=*/false)) {
TCppType_t varN = Cpp::GetVariableType(Cpp::GetNamed(var.c_str()));
Expand Down
2 changes: 1 addition & 1 deletion clingwrapper/src/cpp_cppyy.h
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ namespace Cppyy {

RPY_EXPORTED
TCppIndex_t GetGlobalOperator(
TCppType_t scope, const std::string& lc, const std::string& rc, const std::string& op) { assert(0 && "GetGlobalOperator");return 0; }
TCppType_t scope, const std::string& lc, const std::string& rc, const std::string& op) { assert(0 && "GetGlobalOperator");return -1; }

// method properties ---------------------------------------------------------
RPY_EXPORTED
Expand Down

0 comments on commit 1df4a33

Please sign in to comment.