diff --git a/README/ReleaseNotes/v640/index.md b/README/ReleaseNotes/v640/index.md index 596c22349ebf6..a263593a54373 100644 --- a/README/ReleaseNotes/v640/index.md +++ b/README/ReleaseNotes/v640/index.md @@ -38,6 +38,7 @@ The following people have contributed to this new version: * Comparing C++ `nullptr` objects with `None` in Python now raises a `TypeError`, as announced in the ROOT 6.38 release notes. Use truth-value checks like `if not x` or `x is None` instead. * The `TGLIncludes.h` and `TGLWSIncludes.h` that were deprecated in ROOT 6.38 and scheduled for removal are gone now. Please include your required headers like `` or `` directly. * The GLEW headers (`GL/eglew.h`, `GL/glew.h`, `GL/glxew.h`, and `GL/wglew.h`) that were installed when building ROOT with `builtin_glew=ON` are no longer installed. This is done because ROOT is moving away from GLEW for loading OpenGL extensions. +* The `TF1`, `TF2`, and `TF3` constructors for CINT compatibility were removed. This concerns the templated constructors that additionally took the name of the used functor class and member function. With ROOT 6, these names can be omitted. ## Build System diff --git a/hist/hist/inc/TF1.h b/hist/hist/inc/TF1.h index e4bf185b220ce..0a471c35b337f 100644 --- a/hist/hist/inc/TF1.h +++ b/hist/hist/inc/TF1.h @@ -352,15 +352,6 @@ class TF1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { ROOT::Internal::TF1Builder::Build(this, f); } - // backward compatible interface - template - TF1(const char *name, Func f, Double_t xmin, Double_t xmax, Int_t npar, const char *, EAddToList addToGlobList = EAddToList::kDefault) : - TF1(EFType::kTemplScalar, name, xmin, xmax, npar, 1, addToGlobList, new TF1Parameters(npar)) - { - ROOT::Internal::TF1Builder::Build(this, f); - } - - // Template constructors from a pointer to any C++ class of type PtrObj with a specific member function of type // MemFn. // The member function must have the signature of (double * , double *) and returning a double. @@ -374,12 +365,6 @@ class TF1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { TF1(EFType::kTemplScalar, name, xmin, xmax, npar, ndim, addToGlobList, new TF1Parameters(npar), new TF1FunctorPointerImpl(ROOT::Math::ParamFunctor(p, memFn))) {} - // backward compatible interface - template - TF1(const char *name, const PtrObj &p, MemFn memFn, Double_t xmin, Double_t xmax, Int_t npar, const char *, const char *, EAddToList addToGlobList = EAddToList::kDefault) : - TF1(EFType::kTemplScalar, name, xmin, xmax, npar, 1, addToGlobList, new TF1Parameters(npar), new TF1FunctorPointerImpl(ROOT::Math::ParamFunctor(p, memFn))) - {} - TF1(const TF1 &f1); TF1 &operator=(const TF1 &rhs); ~TF1() override; diff --git a/hist/hist/inc/TF2.h b/hist/hist/inc/TF2.h index 36aaba0b628d1..7bcf1ca8e8427 100644 --- a/hist/hist/inc/TF2.h +++ b/hist/hist/inc/TF2.h @@ -53,15 +53,6 @@ class TF2 : public TF1 { fNpx = 30; } - /// Backward compatible ctor - template - TF2(const char *name, const PtrObj& p, MemFn memFn, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Int_t npar, const char * , const char *) : - TF1(name,p,memFn,xmin,xmax,npar,2), - fYmin(ymin), fYmax(ymax), fNpy(30), fContour(0) - { - fNpx = 30; - } - /// Template constructors from any C++ callable object, defining the operator() (double * , double *) and returning a double. template TF2(const char *name, Func f, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Int_t npar,Int_t ndim = 2, EAddToList addToGlobList = EAddToList::kDefault) : @@ -71,16 +62,6 @@ class TF2 : public TF1 { fNpx = 30; } - /// Backward compatible ctor - template - TF2(const char *name, Func f, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Int_t npar,const char *) : - TF1(name,f,xmin,xmax,npar,2), - fYmin(ymin), fYmax(ymax), fNpy(30), fContour(0) - { - fNpx = 30; - } - - TF2(const TF2 &f2); TF2 &operator=(const TF2& rhs); ~TF2() override; diff --git a/hist/hist/inc/TF3.h b/hist/hist/inc/TF3.h index 2e598f1c579d3..53bd8915ca434 100644 --- a/hist/hist/inc/TF3.h +++ b/hist/hist/inc/TF3.h @@ -53,14 +53,6 @@ class TF3 : public TF2 { fZmin(zmin), fZmax(zmax), fNpz(30) { } - /// Backward compatible ctor - template - TF3(const char *name, const PtrObj& p, MemFn memFn, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Double_t zmin, Double_t zmax, Int_t npar, - const char * , const char * ) : - TF2(name,p,memFn,xmin,xmax,ymin,ymax,npar,3), - fZmin(zmin), fZmax(zmax), fNpz(30) - { } - /// Template constructors from any C++ callable object, defining the operator() (double * , double *) and returning a double. template TF3(const char *name, Func f, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Double_t zmin, Double_t zmax, Int_t npar, @@ -69,14 +61,6 @@ class TF3 : public TF2 { fZmin(zmin), fZmax(zmax), fNpz(30) { } - /// Backward compatible ctor - template - TF3(const char *name, Func f, Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax, Double_t zmin, Double_t zmax, Int_t npar, - const char * ) : - TF2(name,f,xmin,xmax,ymin,ymax,npar,3), - fZmin(zmin), fZmax(zmax), fNpz(30) - { } - TF3(const TF3 &f3); TF3& operator=(const TF3 &rhs); ~TF3() override;