Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2417,7 +2417,7 @@ intptr_t Cppyy::GetDatamemberOffset(TCppScope_t scope, TCppIndex_t idata)
if (m->Property() & kIsStatic) {
if (strchr(cr->GetName(), '<'))
gInterpreter->ProcessLine(((std::string)cr->GetName()+"::"+m->GetName()+";").c_str());
offset = (intptr_t)m->GetOffsetCint(); // yes, Cling (GetOffset() is both wrong
offset = (intptr_t)m->GetOffsetCint(); // yes, Cling GetOffset() is both wrong (TODO: rename to GetOffsetCling?)
// and caches that wrong result!
if (offset == (intptr_t)-1)
return (intptr_t)gInterpreter->ProcessLine((std::string("&")+cr->GetName()+"::"+m->GetName()+";").c_str());
Expand Down
2 changes: 1 addition & 1 deletion bindings/tpython/src/TPyReturn.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ TPyReturn::operator Double_t() const

////////////////////////////////////////////////////////////////////////////////
/// Cast python return value to ROOT object with dictionary (may fail; note that
/// you have to use the void* converter, as CINT will not call any other).
/// you have to use the void* converter, as Cling will not call any other).

TPyReturn::operator void *() const
{
Expand Down
2 changes: 1 addition & 1 deletion hist/hist/inc/TF1.h
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ class TF1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker {
/// The class name is not needed when using compile code, while it is required when using
/// interpreted code via the specialized constructor with void *.
/// An instance of the C++ function class or its pointer can both be used. The former is recommended when using
/// C++ compiled code, but if CINT-compatibility is needed, then a pointer to the function class must be used.
/// C++ compiled code, but for historical CINT-compatibility needs, a pointer to the function class had be supported, too.
/// xmin and xmax specify the plotting range, npar is the number of parameters.
/// See the tutorial math/exampleFunctor.C for an example of using this constructor
template <typename Func>
Expand Down
12 changes: 6 additions & 6 deletions hist/hist/inc/THn.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class THn: public THnBase {
}

/// Forwards to THnBase::SetBinContent().
/// Non-virtual, CINT-compatible replacement of a using declaration.
/// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling
void SetBinContent(const Int_t* idx, Double_t v) {
THnBase::SetBinContent(idx, v);
}
Expand All @@ -105,7 +105,7 @@ class THn: public THnBase {
fSumw2.At(bin) = e2;
}
/// Forwards to THnBase::SetBinContent().
/// Non-virtual, CINT-compatible replacement of a using declaration.
/// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling
void AddBinContent(const Int_t* idx, Double_t v = 1.) {
THnBase::AddBinContent(idx, v);
}
Expand All @@ -116,7 +116,7 @@ class THn: public THnBase {
fSumw2.At(bin) += e2;
}
/// Forwards to THnBase::GetBinContent() overload.
/// Non-virtual, CINT-compatible replacement of a using declaration.
/// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling
Double_t GetBinContent(const Int_t *idx) const {
return THnBase::GetBinContent(idx);
}
Expand All @@ -143,20 +143,20 @@ class THn: public THnBase {
void Sumw2() override;

/// Forwards to THnBase::Projection().
/// Non-virtual, as a CINT-compatible replacement of a using declaration.
/// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling
TH1D* Projection(Int_t xDim, Option_t* option = "") const {
return THnBase::Projection(xDim, option);
}

/// Forwards to THnBase::Projection().
/// Non-virtual, as a CINT-compatible replacement of a using declaration.
/// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling
TH2D* Projection(Int_t yDim, Int_t xDim,
Option_t* option = "") const {
return THnBase::Projection(yDim, xDim, option);
}

/// Forwards to THnBase::Projection().
/// Non-virtual, as a CINT-compatible replacement of a using declaration.
/// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling
TH3D* Projection(Int_t xDim, Int_t yDim, Int_t zDim,
Option_t* option = "") const {
return THnBase::Projection(xDim, yDim, zDim, option);
Expand Down
15 changes: 6 additions & 9 deletions hist/hist/inc/THnSparse.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,23 +110,23 @@ class THnSparse: public THnBase {
Long64_t GetBin(const char* name[], Bool_t allocate = kTRUE) override;

/// Forwards to THnBase::SetBinContent().
/// Non-virtual, CINT-compatible replacement of a using declaration.
/// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling
void SetBinContent(const Int_t* idx, Double_t v) {
THnBase::SetBinContent(idx, v);
}
void SetBinContent(Long64_t bin, Double_t v) override;
void SetBinError2(Long64_t bin, Double_t e2) override;

/// Forwards to THnBase::AddBinContent().
/// Non-virtual, CINT-compatible replacement of a using declaration.
/// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling
void AddBinContent(const Int_t* idx, Double_t v = 1.) {
THnBase::AddBinContent(idx, v);
}
void AddBinContent(Long64_t bin, Double_t v = 1.) override;
void AddBinError2(Long64_t bin, Double_t e2) override;

/// Forwards to THnBase::GetBinContent() overload.
/// Non-virtual, CINT-compatible replacement of a using declaration.
/// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling
Double_t GetBinContent(const Int_t *idx) const {

return THnBase::GetBinContent(idx);
Expand All @@ -138,23 +138,20 @@ class THnSparse: public THnBase {
Double_t GetSparseFractionMem() const;

/// Forwards to THnBase::Projection().
/// Non-virtual, as a CINT-compatible replacement of a using
/// declaration.
/// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling
TH1D* Projection(Int_t xDim, Option_t* option = "") const{
return THnBase::Projection(xDim, option);
}

/// Forwards to THnBase::Projection().
/// Non-virtual, as a CINT-compatible replacement of a using
/// declaration.
/// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling
TH2D* Projection(Int_t yDim, Int_t xDim,
Option_t* option = "") const {
return THnBase::Projection(yDim, xDim, option);
}

/// Forwards to THnBase::Projection().
/// Non-virtual, as a CINT-compatible replacement of a using
/// declaration.
/// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling
TH3D* Projection(Int_t xDim, Int_t yDim, Int_t zDim,
Option_t* option = "") const {
return THnBase::Projection(xDim, yDim, zDim, option);
Expand Down
4 changes: 2 additions & 2 deletions test/MainEvent.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
// - Event.h event class description
// - Event.C event class implementation
// - MainEvent.C the main program to demo this class might be used (this file)
// - EventCint.C the CINT dictionary for the event and Track classes
// this file is automatically generated by rootcint (see Makefile),
// - EventCint.C the Cling dictionary for the event and Track classes
// this file is automatically generated by rootcling (see Makefile),
// when the class definition in Event.h is modified.
//
// ---Analyzing the Event.root file with the interactive root
Expand Down
4 changes: 2 additions & 2 deletions test/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ MainEvent.cxx - Simple test program that creates a ROOT Tree object and
histograms. This program uses the files Event.cxx,
EventCint.cxx and Event.h. An example of a procedure to
link this program is in bind_Event. Note that the Makefile
invokes the rootcint utility to generate the CINT interface
EventCint.cxx.
invokes the rootcling utility to generate the interface
EventCint.cxx (ROOT dictionary).

Event.cxx - Implementation for classes Event and Track.

Expand Down
Loading
Loading