Skip to content

Commit 1df4a33

Browse files
Vipul-Cariappaaaronj0
authored andcommitted
fix: name conflict and GetGlobalOperator
1 parent 7ee7774 commit 1df4a33

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

clingwrapper/src/clingwrapper.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ bool Cppyy::AppendTypesSlow(const std::string &name,
477477
if (!struct_count)
478478
Cpp::Declare(code.c_str()); // initialize the trampoline
479479

480-
std::string var = "__s" + std::to_string(struct_count++);
480+
std::string var = "__Cppyy_s" + std::to_string(struct_count++);
481481
// FIXME: We cannot use silent because it erases our error code from Declare!
482482
if (!Cpp::Declare(("__Cppyy_AppendTypesSlow<" + name + "> " + var +";\n").c_str(), /*silent=*/false)) {
483483
TCppType_t varN = Cpp::GetVariableType(Cpp::GetNamed(var.c_str()));

clingwrapper/src/cpp_cppyy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ namespace Cppyy {
311311

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

316316
// method properties ---------------------------------------------------------
317317
RPY_EXPORTED

0 commit comments

Comments
 (0)