Remove previously deprecated functions.

saberduck · Sep 30, 2016 · 5538cbe · 5538cbe
1 parent 336a979
commit 5538cbe
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 196 deletions.
diff --git a/README/ReleaseNotes/v610/index.md b/README/ReleaseNotes/v610/index.md
@@ -28,10 +28,18 @@ The following people have contributed to this new version:
  Vassil Vassilev, Fermilab/CMS,\
  Wouter Verkerke, NIKHEF/Atlas, RooFit
 
+## Removed interfaces
 
-## Core Libraries
+The following interfaces have been removed, after deprecation in v6.08.
+
+### CINT remnants, dysfunctional for ROOT 6
+- `TInterpreter`'s `Getgvp()`, `Getp2f2funcname(void*)`, `Setgvp(Long_t)`, `SetRTLD_NOW()`, `SetRTLD_LAZY()`.
+- `SetFCN(void*)` from TVirtualFitter, TFitter, TBackCompFitter, TMinuit
+- `TFoam::SetRhoInt(void*)`
 
 
+## Core Libraries
+
 ## Histogram Libraries
 
 

diff --git a/core/meta/inc/TInterpreter.h b/core/meta/inc/TInterpreter.h
@@ -209,12 +209,6 @@ class TInterpreter : public TNamed {
    virtual void  *FindSym(const char * /* entry */) const {return 0;}
    virtual void   GenericError(const char * /* error */) const {;}
    virtual Long_t GetExecByteCode() const {return 0;}
-   virtual Long_t Getgvp() const
-      R__DEPRECATED(6,10, "CINT remnant, not applicable to cling")
-   {return 0;}
-   virtual const char *Getp2f2funcname(void * /* receiver */) const
-      R__DEPRECATED(6,10, "CINT remnant, not applicable to cling")
-   {return 0;}
    virtual const char *GetTopLevelMacroName() const {return 0;};
    virtual const char *GetCurrentMacroName()  const {return 0;};
    virtual int    GetSecurityError() const{return 0;}
@@ -226,15 +220,6 @@ class TInterpreter : public TNamed {
    virtual int    SetClassAutoloading(int) const {return 0;}
    virtual int    SetClassAutoparsing(int) {return 0;};
    virtual void   SetErrmsgcallback(void * /* p */) const {;}
-   virtual void   Setgvp(Long_t) const
-      R__DEPRECATED(6,10, "CINT remnant, not applicable to cling")
-   {;}
-   virtual void   SetRTLD_NOW() const
-      R__DEPRECATED(6,10, "CINT remnant, not applicable to cling")
-   {;}
-   virtual void   SetRTLD_LAZY() const
-      R__DEPRECATED(6,10, "CINT remnant, not applicable to cling")
-   {;}
    virtual void   SetTempLevel(int /* val */) const {;}
    virtual int    UnloadFile(const char * /* path */) const {return 0;}
    virtual TInterpreterValue *CreateTemporary() { return 0; }

diff --git a/core/meta/src/TCling.cxx b/core/meta/src/TCling.cxx
@@ -6271,26 +6271,6 @@ Long_t TCling::GetExecByteCode() const
    return 0;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// Interface to the CINT global object pointer which was controlling the
-/// behavior of the wrapper around the calls to operator new and the constructor
-/// and operator delete and the destructor.
-
-Long_t TCling::Getgvp() const
-{
-   Error("Getgvp","This was controlling the behavior of the wrappers for object construction and destruction.\nThis is now a nop and likely change the behavior of the calling routines.");
-   return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-const char* TCling::Getp2f2funcname(void*) const
-{
-   Error("Getp2f2funcname", "Will not be implemented: "
-         "all function pointers are compiled!");
-   return NULL;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Interface to cling function
 
@@ -6406,30 +6386,6 @@ void TCling::SetErrmsgcallback(void* p) const
 #endif
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// Interface to the cling global object pointer which was controlling the
-/// behavior of the wrapper around the calls to operator new and the constructor
-/// and operator delete and the destructor.
-
-void TCling::Setgvp(Long_t gvp) const
-{
-   Error("Setgvp","This was controlling the behavior of the wrappers for object construction and destruction.\nThis is now a nop and likely change the behavior of the calling routines.");
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void TCling::SetRTLD_NOW() const
-{
-   Error("SetRTLD_NOW()", "Will never be implemented! Don't use!");
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void TCling::SetRTLD_LAZY() const
-{
-   Error("SetRTLD_LAZY()", "Will never be implemented! Don't use!");
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Create / close a scope for temporaries. No-op for cling; use

diff --git a/core/meta/src/TCling.h b/core/meta/src/TCling.h
@@ -286,8 +286,6 @@ class TCling : public TInterpreter {
    virtual void*  FindSym(const char* entry) const;
    virtual void   GenericError(const char* error) const;
    virtual Long_t GetExecByteCode() const;
-   virtual Long_t Getgvp() const;
-   virtual const char* Getp2f2funcname(void* receiver) const;
    virtual const char* GetTopLevelMacroName() const;
    virtual const char* GetCurrentMacroName() const;
    virtual int    GetSecurityError() const;
@@ -300,9 +298,6 @@ class TCling : public TInterpreter {
    virtual int    SetClassAutoparsing(int) ;
            Bool_t IsAutoParsingSuspended() const { return fIsAutoParsingSuspended; }
    virtual void   SetErrmsgcallback(void* p) const;
-   virtual void   Setgvp(Long_t) const;
-   virtual void   SetRTLD_NOW() const;
-   virtual void   SetRTLD_LAZY() const;
    virtual void   SetTempLevel(int val) const;
    virtual int    UnloadFile(const char* path) const;
 

diff --git a/hist/hist/inc/TBackCompFitter.h b/hist/hist/inc/TBackCompFitter.h
@@ -99,9 +99,6 @@ class TBackCompFitter : public TVirtualFitter {
    virtual Int_t     SetParameter(Int_t ipar,const char *parname,Double_t value,Double_t verr,Double_t vlow, Double_t vhigh);
 
    virtual void      SetFCN(void (*fcn)(Int_t &, Double_t *, Double_t &f, Double_t *, Int_t) );
-   // this for CINT (interactive functions)
-   virtual void      SetFCN(void * )
-      R__DEPRECATED(6,10, "CINT remnant; not used anymore");
    // for using interpreted function passed by the user
    virtual void SetMethodCall(TMethodCall * m) { fMethodCall = m; }
 

diff --git a/hist/hist/inc/TVirtualFitter.h b/hist/hist/inc/TVirtualFitter.h
@@ -96,8 +96,6 @@ class TVirtualFitter : public TNamed {
    virtual void      PrintResults(Int_t level, Double_t amin) const = 0;
    virtual void      ReleaseParameter(Int_t ipar) = 0;
    virtual Double_t *SetCache(Int_t npoints, Int_t psize);
-   virtual void      SetFCN(void *fcn)
-      R__DEPRECATED(6,10, "CINT remnant; not used anymore");
    virtual void      SetFCN(void (*fcn)(Int_t &, Double_t *, Double_t &f, Double_t *, Int_t));
    virtual void      SetFitMethod(const char *name) = 0;
    virtual void      SetFitOption(Foption_t option) {fOption = option;}

diff --git a/hist/hist/src/TBackCompFitter.cxx b/hist/hist/src/TBackCompFitter.cxx
@@ -741,44 +741,6 @@ void TBackCompFitter::SetFCN(void (*fcn)(Int_t &, Double_t *, Double_t &f, Doubl
 }
 
 
-////////////////////////////////////////////////////////////////////////////////
-/// Static function called when SetFCN is called in interactive mode
-
-void InteractiveFCNm2(Int_t &npar, Double_t *gin, Double_t &f, Double_t *u, Int_t flag)
-{
-   // get method call from static instance
-   TMethodCall *m  = (TVirtualFitter::GetFitter())->GetMethodCall();
-   if (!m) return;
-
-   Long_t args[5];
-   args[0] = (Long_t)&npar;
-   args[1] = (Long_t)gin;
-   args[2] = (Long_t)&f;
-   args[3] = (Long_t)u;
-   args[4] = (Long_t)flag;
-   m->SetParamPtrs(args);
-   Double_t result;
-   m->Execute(result);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-/// Set the address of the minimization function
-/// this function is called by CINT instead of the function above
-
-void TBackCompFitter::SetFCN(void *fcn)
-{
-   if (!fcn) return;
-   Error("SetFCN", "Not used anymore.");
-
-   fFCN = InteractiveFCNm2;
-   // set the static instance (required by InteractiveFCNm)
-   TVirtualFitter::SetFitter(this);
-
-   if (fObjFunc) delete fObjFunc;
-   fObjFunc = new ROOT::Fit::FcnAdapter(fFCN);
-   DoSetDimension();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Set the objective function for fitting
 /// Needed if fitting directly using TBackCompFitter class

diff --git a/hist/hist/src/TVirtualFitter.cxx b/hist/hist/src/TVirtualFitter.cxx
@@ -269,25 +269,6 @@ void TVirtualFitter::SetFCN(void (*fcn)(Int_t &, Double_t *, Double_t &f, Double
    fFCN = fcn;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// Static function called when SetFCN is called in interactive mode
-
-void InteractiveFCN(Int_t &npar, Double_t *gin, Double_t &f, Double_t *u, Int_t flag)
-{
-   TMethodCall *m = TVirtualFitter::GetFitter()->GetMethodCall();
-   if (!m) return;
-
-   Long_t args[5];
-   args[0] = (Long_t)&npar;
-   args[1] = (Long_t)gin;
-   args[2] = (Long_t)&f;
-   args[3] = (Long_t)u;
-   args[4] = (Long_t)flag;
-   m->SetParamPtrs(args);
-   Double_t result;
-   m->Execute(result);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Initialize the cache array
 /// npoints is the number of points to be stored (or already stored) in the cache
@@ -309,20 +290,6 @@ Double_t *TVirtualFitter::SetCache(Int_t npoints, Int_t psize)
    return fCache;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-///  To set the address of the minimization objective function
-///
-///     this function is called by CINT instead of the function above
-
-void TVirtualFitter::SetFCN(void *fcn)
-{
-   if (!fcn) return;
-
-   Error("SetFCN", "Not used anymore.");
-
-   fFCN = InteractiveFCN;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// static: Set the maximum number of function calls for the minimization algorithm
 /// For example for MIGRAD this is the maxcalls value passed as first argument

diff --git a/math/foam/inc/TFoam.h b/math/foam/inc/TFoam.h
@@ -117,8 +117,6 @@ class TFoam : public TObject {
    virtual void Finalize(  Double_t&, Double_t&);  // Prints summary of MC integration
    virtual TFoamIntegrand  *GetRho(){return fRho;} // Gets pointer of the distribut. (after restoring from disk)
    virtual TRandom *GetPseRan() const {return fPseRan;}   // Gets pointer of r.n. generator (after restoring from disk)
-   virtual void SetRhoInt(void *Rho)              // Set new integrand distr. in interactive mode
-      R__DEPRECATED(6,10, "CINT remnant; not used anymore");
    virtual void SetRhoInt(Double_t (*fun)(Int_t, Double_t *));    // Set new integrand distr. in compiled mode
    virtual void SetRho(TFoamIntegrand *Rho);       // Set new integrand distr. in compiled mode
    virtual void ResetRho(TFoamIntegrand *Rho);                // Set new distribution, delete old

diff --git a/math/foam/src/TFoam.cxx b/math/foam/src/TFoam.cxx
@@ -1085,26 +1085,6 @@ void TFoam::ResetRho(TFoamIntegrand *fun)
    SetRho(fun);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// User may use this to set pointer to the global function (not descending
-/// from TFoamIntegrand) serving as a distribution for FOAM.
-/// It is useful for simple interactive applications.
-/// Note that persistency for FOAM object will not work in the case of such
-/// a distribution.
-
-void TFoam::SetRhoInt( void * /*fun*/)
-{
-   Error("SetRhoInt", "Not used anymore.");
-   /*
-   const char *namefcn = gCling->Getp2f2funcname(fun); //name of integrand function
-   if(namefcn) {
-      fMethodCall=new TMethodCall();
-      fMethodCall->InitWithPrototype(namefcn, "Int_t, Double_t *");
-   }
-   */
-   fRho=0;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Internal subprogram.
 /// Evaluates distribution to be generated.

diff --git a/math/minuit/inc/TFitter.h b/math/minuit/inc/TFitter.h
@@ -66,8 +66,6 @@ class TFitter : public TVirtualFitter {
    virtual Bool_t     IsFixed(Int_t ipar) const;
    virtual void       PrintResults(Int_t level, Double_t amin) const;
    virtual void       ReleaseParameter(Int_t ipar);
-   virtual void       SetFCN(void *fcn)
-      R__DEPRECATED(6,10, "CINT remnant; not used anymore");
    virtual void       SetFCN(void (*fcn)(Int_t &, Double_t *, Double_t &f, Double_t *, Int_t));
    virtual void       SetFitMethod(const char *name);
    virtual Int_t      SetParameter(Int_t ipar,const char *parname,Double_t value,Double_t verr,Double_t vlow, Double_t vhigh);

diff --git a/math/minuit/inc/TMinuit.h b/math/minuit/inc/TMinuit.h
@@ -263,8 +263,6 @@ class TMinuit : public TNamed {
    virtual void   mnwerr();
    virtual Int_t  Release( Int_t parNo );
    virtual Int_t  SetErrorDef( Double_t up );
-   virtual void   SetFCN(void *fcn)
-      R__DEPRECATED(6,10, "CINT remnant; not used anymore");
    virtual void   SetFCN(void (*fcn)(Int_t &, Double_t *, Double_t &f, Double_t *, Int_t));
    virtual void   SetGraphicsMode(Bool_t mode=kTRUE) {fGraphicsMode = mode;}
    virtual void   SetMaxIterations(Int_t maxiter=500) {fMaxIterations = maxiter;}

diff --git a/math/minuit/src/TFitter.cxx b/math/minuit/src/TFitter.cxx
@@ -540,20 +540,6 @@ void TFitter::ReleaseParameter(Int_t ipar)
    fMinuit->Release(ipar);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// Specify the address of the fitting algorithm (from the interpreter)
-
-void TFitter::SetFCN(void * /*fcn*/)
-{
-   if (fCovar)  {delete [] fCovar; fCovar = 0;}
-
-   Error("SetFCN", "Not used anymore.");
-
-   //TVirtualFitter::SetFCN(fcn);
-   //fMinuit->SetFCN(fcn);
-
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Specify the address of the fitting algorithm
 

diff --git a/math/minuit/src/TMinuit.cxx b/math/minuit/src/TMinuit.cxx
@@ -948,21 +948,6 @@ void InteractiveFCNm(Int_t &npar, Double_t *gin, Double_t &f, Double_t *u, Int_t
    m->Execute(result);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// To set the address of the minimization function
-///
-/// this function is called by the interpretor instead of the function above
-
-void TMinuit::SetFCN(void *fcn)
-{
-   if (!fcn) return;
-
-   Error("SetFCN", "Not used anymore.");
-
-   fFCN = InteractiveFCNm;
-   gMinuit = this; //required by InteractiveFCNm
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// set Minuit print level.
 ///