Skip to content

Commit c124bcf

Browse files
committed
[backend] reconcile minor format diff with compres fork
1 parent 35feb18 commit c124bcf

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,8 +1661,8 @@ std::string Cppyy::GetMethodArgName(TCppMethod_t method, TCppIndex_t iarg)
16611661
{
16621662
if (!method)
16631663
return "<unknown>";
1664-
std::lock_guard<std::recursive_mutex> Lock(InterOpMutex);
16651664

1665+
std::lock_guard<std::recursive_mutex> Lock(InterOpMutex);
16661666
return Cpp::GetFunctionArgName(method, iarg);
16671667
}
16681668

@@ -1675,7 +1675,7 @@ Cppyy::TCppType_t Cppyy::GetMethodArgType(TCppMethod_t method, TCppIndex_t iarg)
16751675
std::string Cppyy::GetMethodArgTypeAsString(TCppMethod_t method, TCppIndex_t iarg)
16761676
{
16771677
std::lock_guard<std::recursive_mutex> Lock(InterOpMutex);
1678-
return Cpp::GetTypeAsString(Cpp::RemoveTypeQualifier(
1678+
return Cpp::GetTypeAsString(Cpp::RemoveTypeQualifier(
16791679
Cpp::GetFunctionArgType(method, iarg), Cpp::QualKind::Const));
16801680
}
16811681

@@ -1826,6 +1826,7 @@ Cppyy::TCppMethod_t Cppyy::GetMethodTemplate(
18261826
}
18271827

18281828
std::lock_guard<std::recursive_mutex> Lock(InterOpMutex);
1829+
18291830
std::vector<Cppyy::TCppMethod_t> unresolved_candidate_methods;
18301831
Cpp::GetClassTemplatedMethods(pureName, scope, unresolved_candidate_methods);
18311832
if (unresolved_candidate_methods.empty() && name.find("operator") == 0) {
@@ -1838,7 +1839,6 @@ Cppyy::TCppMethod_t Cppyy::GetMethodTemplate(
18381839
std::vector<Cpp::TemplateArgInfo> templ_params;
18391840
Cppyy::AppendTypesSlow(proto, arg_types, scope);
18401841
Cppyy::AppendTypesSlow(explicit_params, templ_params, scope);
1841-
18421842
Cppyy::TCppMethod_t cppmeth = nullptr;
18431843
cppmeth = Cpp::BestOverloadFunctionMatch(
18441844
unresolved_candidate_methods, templ_params, arg_types);

0 commit comments

Comments
 (0)