Skip to content

Commit 60cb356

Browse files
ferdymercuryguitargeek
authored andcommitted
[pyroot] rename CINT to Cling
1 parent 8790a1c commit 60cb356

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,7 +2502,7 @@ bool CPyCppyy::InstanceArrayConverter::ToMemory(
25022502
}
25032503

25042504
//___________________________________________________________________________
2505-
// CLING WORKAROUND -- classes for STL iterators are completely undefined in that
2505+
// Cling WORKAROUND -- classes for STL iterators are completely undefined in that
25062506
// they come in a bazillion different guises, so just do whatever
25072507
bool CPyCppyy::STLIteratorConverter::SetArg(
25082508
PyObject* pyobject, Parameter& para, CallContext* /* ctxt */)
@@ -2516,7 +2516,7 @@ bool CPyCppyy::STLIteratorConverter::SetArg(
25162516
para.fTypeCode = 'V';
25172517
return true;
25182518
}
2519-
// -- END CLING WORKAROUND
2519+
// -- END Cling WORKAROUND
25202520

25212521
//----------------------------------------------------------------------------
25222522
bool CPyCppyy::VoidPtrRefConverter::SetArg(
@@ -3348,12 +3348,12 @@ CPyCppyy::Converter* CPyCppyy::CreateConverter(const std::string& fullType, cdim
33483348
}
33493349

33503350
if (!result) {
3351-
// CLING WORKAROUND -- special case for STL iterators
3351+
// Cling WORKAROUND -- special case for STL iterators
33523352
if (Utility::IsSTLIterator(realType)) {
33533353
static STLIteratorConverter c;
33543354
result = &c;
33553355
} else
3356-
// -- CLING WORKAROUND
3356+
// -- Cling WORKAROUND
33573357
result = selectInstanceCnv(klass, cpd, dims, isConst, control);
33583358
}
33593359
} else {

bindings/pyroot/cppyy/CPyCppyy/src/DeclareConverters.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,13 +334,13 @@ class ComplexDConverter: public InstanceConverter {
334334
};
335335

336336

337-
// CLING WORKAROUND -- classes for STL iterators are completely undefined in that
337+
// Cling WORKAROUND -- classes for STL iterators are completely undefined in that
338338
// they come in a bazillion different guises, so just do whatever
339339
class STLIteratorConverter : public Converter {
340340
public:
341341
bool SetArg(PyObject*, Parameter&, CallContext* = nullptr) override;
342342
};
343-
// -- END CLING WORKAROUND
343+
// -- END Cling WORKAROUND
344344

345345

346346
class VoidPtrRefConverter : public Converter {

bindings/pyroot/cppyy/CPyCppyy/src/PyResult.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ CPyCppyy::PyResult::operator double() const
143143
CPyCppyy::PyResult::operator void*() const
144144
{
145145
// Cast python return value to C++ object with dictionary (may fail; note that
146-
// you have to use the void* converter, as CINT will not call any other).
146+
// you have to use the void* converter, as Cling will not call any other).
147147
if (fPyObject == Py_None)
148148
return nullptr;
149149

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,12 +2417,12 @@ intptr_t Cppyy::GetDatamemberOffset(TCppScope_t scope, TCppIndex_t idata)
24172417
if (m->Property() & kIsStatic) {
24182418
if (strchr(cr->GetName(), '<'))
24192419
gInterpreter->ProcessLine(((std::string)cr->GetName()+"::"+m->GetName()+";").c_str());
2420-
offset = (intptr_t)m->GetOffsetCint(); // yes, CINT (GetOffset() is both wrong
2420+
offset = (intptr_t)m->GetOffsetCint(); // yes, Cling (GetOffset() is both wrong
24212421
// and caches that wrong result!
24222422
if (offset == (intptr_t)-1)
24232423
return (intptr_t)gInterpreter->ProcessLine((std::string("&")+cr->GetName()+"::"+m->GetName()+";").c_str());
24242424
} else
2425-
offset = (intptr_t)m->GetOffsetCint(); // yes, CINT, see above
2425+
offset = (intptr_t)m->GetOffsetCint(); // yes, Cling, see above
24262426
return offset;
24272427
}
24282428

bindings/pyroot/cppyy/cppyy/doc/source/history.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ Mid 2018, version 1.0 was released.
4848
.. _`boost.python`: https://wiki.python.org/moin/boost.python/GettingStarted
4949
.. _`sprint at CERN`: https://morepypy.blogspot.com/2010/07/cern-sprint-report-wrapping-c-libraries.html
5050
.. _`PyPy`: https://www.pypy.org/
51-
.. _`Cling`: https://github.com/vgvassilev/cling
51+
.. _`Cling`: https://github.com/root-project/cling
5252
.. _`PyPI`: https://pypi.org/

bindings/pyroot/cppyy/patches/using-data-members.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ index ae52fbe635..d2faa2472c 100644
7474
if (cr.GetClass()) {
7575
- TDataMember* m = (TDataMember*)cr->GetListOfDataMembers()->At((int)idata);
7676
+ TDataMember* m = GetDataMemberByIndex(cr, (int)idata);
77-
// CLING WORKAROUND: the following causes templates to be instantiated first within the proper
77+
// Cling WORKAROUND: the following causes templates to be instantiated first within the proper
7878
// scope, making the lookup succeed and preventing spurious duplicate instantiations later. Also,
7979
// if the variable is not yet loaded, pull it in through gInterpreter.
8080
@@ -1944,6 +1963,10 @@ Cppyy::TCppIndex_t Cppyy::GetDatamemberIndex(TCppScope_t scope, const std::strin

bindings/pyroot/pythonizations/src/TPyDispatcher.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// ==========================
2727
//
2828
// The TPyDispatcher class acts as a functor that can be used for TFn's and GUIs
29-
// to install callbacks from CINT.
29+
// to install callbacks from Cling.
3030

3131
//- constructors/destructor --------------------------------------------------
3232
TPyDispatcher::TPyDispatcher(PyObject *callable) : fCallable(0)

0 commit comments

Comments
 (0)