From ba60aeb51dd73f44a47fb9a3ca5aa9f0626a77e6 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Thu, 29 Sep 2016 17:35:37 +0200
Subject: [PATCH] Replace more auto_ptrs, silence a few
-Wno-deprecated-declarations.
---
core/base/src/TQConnection.cxx | 3 +++
graf3d/gl/src/TGLViewer.cxx | 4 ++--
hist/hist/inc/TBackCompFitter.h | 3 ++-
hist/hist/inc/TVirtualFitter.h | 3 ++-
hist/hist/src/TBackCompFitter.cxx | 7 +------
hist/hist/src/TVirtualFitter.cxx | 9 ++-------
math/foam/inc/TFoam.h | 3 ++-
math/foam/src/TFoam.cxx | 6 ++++--
math/mathcore/CMakeLists.txt | 4 +++-
math/mathcore/test/fit/testRooFit.cxx | 6 +++---
math/mathmore/test/CMakeLists.txt | 3 +++
math/minuit/inc/TFitter.h | 3 ++-
math/minuit/inc/TMinuit.h | 3 ++-
math/minuit/src/TFitter.cxx | 7 +++++--
math/minuit/src/TMinuit.cxx | 8 ++------
net/davix/CMakeLists.txt | 2 ++
roofit/roofitcore/CMakeLists.txt | 1 +
test/stressProof.cxx | 4 ++--
tmva/tmva/src/MsgLogger.cxx | 4 ++--
19 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/core/base/src/TQConnection.cxx b/core/base/src/TQConnection.cxx
index ddff1211b4b..747516fe7cd 100644
--- a/core/base/src/TQConnection.cxx
+++ b/core/base/src/TQConnection.cxx
@@ -464,9 +464,12 @@ TQConnection::TQConnection(TClass *cl, void *receiver, const char *method_name)
fReceiver = receiver; // fReceiver is pointer to receiver
if (!cl) {
+ Error("SetFCN", "Not used anymore.");
+ /*
funcname = gCling->Getp2f2funcname(fReceiver);
if (!funcname)
Warning("TQConnection", "%s cannot be compiled", method_name);
+ */
}
if (cl) fClassName = cl->GetName();
diff --git a/graf3d/gl/src/TGLViewer.cxx b/graf3d/gl/src/TGLViewer.cxx
index a575fc8545a..38f626d87f0 100644
--- a/graf3d/gl/src/TGLViewer.cxx
+++ b/graf3d/gl/src/TGLViewer.cxx
@@ -864,7 +864,7 @@ Bool_t TGLViewer::SavePictureUsingBB(const TString &fileName)
glReadPixels(0, 0, fViewport.Width(), fViewport.Height(),
GL_BGRA, GL_UNSIGNED_BYTE, xx);
- std::auto_ptr<TImage> image(TImage::Create());
+ std::unique_ptr<TImage> image(TImage::Create());
image->FromGLBuffer(xx, fViewport.Width(), fViewport.Height());
image->WriteImage(fileName);
@@ -956,7 +956,7 @@ Bool_t TGLViewer::SavePictureUsingFBO(const TString &fileName, Int_t w, Int_t h,
glReadPixels(0, 0, fViewport.Width(), fViewport.Height(),
GL_BGRA, GL_UNSIGNED_BYTE, xx);
- std::auto_ptr<TImage> image(TImage::Create());
+ std::unique_ptr<TImage> image(TImage::Create());
image->FromGLBuffer(xx, fViewport.Width(), fViewport.Height());
image->WriteImage(fileName);
diff --git a/hist/hist/inc/TBackCompFitter.h b/hist/hist/inc/TBackCompFitter.h
index 24550885645..cfa62e22f4f 100644
--- a/hist/hist/inc/TBackCompFitter.h
+++ b/hist/hist/inc/TBackCompFitter.h
@@ -100,7 +100,8 @@ public:
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 * );
+ 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
index fca338a29f2..a41b06035e4 100644
--- a/hist/hist/inc/TVirtualFitter.h
+++ b/hist/hist/inc/TVirtualFitter.h
@@ -96,7 +96,8 @@ public:
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);
+ 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
index 8c9104c6e8d..03d353d7eea 100644
--- a/hist/hist/src/TBackCompFitter.cxx
+++ b/hist/hist/src/TBackCompFitter.cxx
@@ -39,7 +39,6 @@ class before issuing a new fit to avoid deleting this information.
#include "TMethodCall.h"
-#include "TInterpreter.h"
#include "Math/Util.h"
@@ -769,12 +768,8 @@ void InteractiveFCNm2(Int_t &npar, Double_t *gin, Double_t &f, Double_t *u, Int_
void TBackCompFitter::SetFCN(void *fcn)
{
if (!fcn) return;
+ Error("SetFCN", "Not used anymore.");
- const char *funcname = gCling->Getp2f2funcname(fcn);
- if (funcname) {
- fMethodCall = new TMethodCall();
- fMethodCall->InitWithPrototype(funcname,"Int_t&,Double_t*,Double_t&,Double_t*,Int_t");
- }
fFCN = InteractiveFCNm2;
// set the static instance (required by InteractiveFCNm)
TVirtualFitter::SetFitter(this);
diff --git a/hist/hist/src/TVirtualFitter.cxx b/hist/hist/src/TVirtualFitter.cxx
index e914951894c..e3660006ca6 100644
--- a/hist/hist/src/TVirtualFitter.cxx
+++ b/hist/hist/src/TVirtualFitter.cxx
@@ -19,7 +19,6 @@
#include "TVirtualFitter.h"
#include "TPluginManager.h"
#include "TEnv.h"
-#include "TInterpreter.h"
#include "Math/MinimizerOptions.h"
#include "ThreadLocalStorage.h"
@@ -319,12 +318,8 @@ void TVirtualFitter::SetFCN(void *fcn)
{
if (!fcn) return;
- const char *funcname = gCling->Getp2f2funcname(fcn);
- if (funcname) {
- delete fMethodCall;
- fMethodCall = new TMethodCall();
- fMethodCall->InitWithPrototype(funcname,"Int_t&,Double_t*,Double_t&,Double_t*,Int_t");
- }
+ Error("SetFCN", "Not used anymore.");
+
fFCN = InteractiveFCN;
}
diff --git a/math/foam/inc/TFoam.h b/math/foam/inc/TFoam.h
index ba06d42b792..38f69c8207d 100644
--- a/math/foam/inc/TFoam.h
+++ b/math/foam/inc/TFoam.h
@@ -117,7 +117,8 @@ public:
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
+ 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
index 9750d750142..ff073b572b3 100644
--- a/math/foam/src/TFoam.cxx
+++ b/math/foam/src/TFoam.cxx
@@ -1092,14 +1092,16 @@ void TFoam::ResetRho(TFoamIntegrand *fun)
/// Note that persistency for FOAM object will not work in the case of such
/// a distribution.
-void TFoam::SetRhoInt( void * fun)
+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;
}
diff --git a/math/mathcore/CMakeLists.txt b/math/mathcore/CMakeLists.txt
index 450a769197d..043df0fe42b 100644
--- a/math/mathcore/CMakeLists.txt
+++ b/math/mathcore/CMakeLists.txt
@@ -2,6 +2,8 @@
# CMakeLists.txt file for building ROOT io/io package
############################################################################
+ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-deprecated-declarations) # auto_ptr...
+
set(MATHCORE_HEADERS TRandom.h
TRandom1.h TRandom2.h TRandom3.h TKDTree.h TKDTreeBinning.h TStatistic.h
Math/IParamFunction.h Math/IFunction.h Math/ParamFunctor.h Math/Functor.h
@@ -19,7 +21,7 @@ set(MATHCORE_HEADERS TRandom.h
ROOT_GENERATE_DICTIONARY(G__MathCore TComplex.h TMath.h ${MATHCORE_HEADERS} Fit/*.h MODULE MathCore LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
-add_definitions(-DUSE_ROOT_ERROR )
+add_definitions(-DUSE_ROOT_ERROR)
ROOT_ADD_C_FLAG(_flags -Wno-strict-overflow) # Avoid what it seems a compiler false positive warning
ROOT_ADD_C_FLAG(_flags -Wno-maybe-uninitialized) # Avoid what it seems a compiler false positive warning
ROOT_ADD_C_FLAG(_flags -Wno-parentheses-equality)
diff --git a/math/mathcore/test/fit/testRooFit.cxx b/math/mathcore/test/fit/testRooFit.cxx
index b9c1413ad79..f6d234b31d4 100644
--- a/math/mathcore/test/fit/testRooFit.cxx
+++ b/math/mathcore/test/fit/testRooFit.cxx
@@ -159,8 +159,8 @@ class MultiGaussRooPdf {
RooAbsPdf & getPdf() { return *pdf.back(); }
- std::auto_ptr<RooArgSet> getVars() {
- std::auto_ptr<RooArgSet> vars(new RooArgSet() );
+ std::unique_ptr<RooArgSet> getVars() {
+ std::unique_ptr<RooArgSet> vars(new RooArgSet() );
for (unsigned int i = 0; i < x.size(); ++i)
vars->add(*x[i]);
return vars;
@@ -352,7 +352,7 @@ int main() {
MultiGaussRooPdf multipdf(N);
RooAbsPdf & pdf = multipdf.getPdf();
- std::auto_ptr<RooArgSet> xvars = multipdf.getVars();
+ std::unique_ptr<RooArgSet> xvars(multipdf.getVars());
WrapperRooPdf wpdf( &pdf, *xvars );
diff --git a/math/mathmore/test/CMakeLists.txt b/math/mathmore/test/CMakeLists.txt
index 19be3599218..7e45c31606a 100644
--- a/math/mathmore/test/CMakeLists.txt
+++ b/math/mathmore/test/CMakeLists.txt
@@ -41,6 +41,9 @@ endif()
include_directories(${GSL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR})
add_definitions(-DUSE_ROOT_ERROR -DHAVE_ROOTLIBS)
+ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-deprecated-declarations) # bind1st
+
+
#---Build and add all the defined test in the list---------------
foreach(file ${TestMathMoreSource})
get_filename_component(testname ${file} NAME_WE)
diff --git a/math/minuit/inc/TFitter.h b/math/minuit/inc/TFitter.h
index 54b53fc9bbb..b3295771c39 100644
--- a/math/minuit/inc/TFitter.h
+++ b/math/minuit/inc/TFitter.h
@@ -66,7 +66,8 @@ public:
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);
+ 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
index b9329adc194..828d4ed236b 100644
--- a/math/minuit/inc/TMinuit.h
+++ b/math/minuit/inc/TMinuit.h
@@ -263,7 +263,8 @@ public:
virtual void mnwerr();
virtual Int_t Release( Int_t parNo );
virtual Int_t SetErrorDef( Double_t up );
- virtual void SetFCN(void *fcn);
+ 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
index 70818b32251..855ae136ec0 100644
--- a/math/minuit/src/TFitter.cxx
+++ b/math/minuit/src/TFitter.cxx
@@ -546,8 +546,11 @@ void TFitter::ReleaseParameter(Int_t ipar)
void TFitter::SetFCN(void *fcn)
{
if (fCovar) {delete [] fCovar; fCovar = 0;}
- TVirtualFitter::SetFCN(fcn);
- fMinuit->SetFCN(fcn);
+
+ Error("SetFCN", "Not used anymore.");
+
+ //TVirtualFitter::SetFCN(fcn);
+ //fMinuit->SetFCN(fcn);
}
diff --git a/math/minuit/src/TMinuit.cxx b/math/minuit/src/TMinuit.cxx
index ccac369e8a6..6403f5904ff 100644
--- a/math/minuit/src/TMinuit.cxx
+++ b/math/minuit/src/TMinuit.cxx
@@ -340,7 +340,6 @@ into account the non-linearities much more precisely.
#include "TError.h"
#include "TPluginManager.h"
#include "TClass.h"
-#include "TInterpreter.h"
TMinuit *gMinuit;
@@ -958,11 +957,8 @@ void TMinuit::SetFCN(void *fcn)
{
if (!fcn) return;
- const char *funcname = gCling->Getp2f2funcname(fcn);
- if (funcname) {
- fMethodCall = new TMethodCall();
- fMethodCall->InitWithPrototype(funcname,"Int_t&,Double_t*,Double_t&,Double_t*,Int_t");
- }
+ Error("SetFCN", "Not used anymore.");
+
fFCN = InteractiveFCNm;
gMinuit = this; //required by InteractiveFCNm
}
diff --git a/net/davix/CMakeLists.txt b/net/davix/CMakeLists.txt
index 7d395cf6e10..1368750fd47 100644
--- a/net/davix/CMakeLists.txt
+++ b/net/davix/CMakeLists.txt
@@ -8,6 +8,8 @@ include_directories(${DAVIX_INCLUDE_DIRS})
# Workaround for defects in davix 0.3.1: https://its.cern.ch/jira/browse/DMC-577
ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-ignored-qualifiers)
ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-unused-parameter)
+ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-deprecated-declarations) # Davix getAllReplicas
+
ROOT_GENERATE_DICTIONARY(G__DAVIX *.h MODULE RDAVIX LINKDEF LinkDef.h)
diff --git a/roofit/roofitcore/CMakeLists.txt b/roofit/roofitcore/CMakeLists.txt
index 412b1b3cd2c..acff0d51368 100644
--- a/roofit/roofitcore/CMakeLists.txt
+++ b/roofit/roofitcore/CMakeLists.txt
@@ -3,6 +3,7 @@
# @author Pere Mato, CERN
############################################################################
+ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-deprecated-declarations) # auto_ptr
set(headers1 Roo1DTable.h RooAbsArg.h RooAbsBinning.h RooAbsCategory.h RooAbsCategoryLValue.h RooAbsCollection.h
RooAbsData.h RooAbsFunc.h RooAbsGenContext.h RooAbsTestStatistic.h RooAbsHiddenReal.h RooAbsIntegrator.h
diff --git a/test/stressProof.cxx b/test/stressProof.cxx
index 0ff17ff81dd..90bec2711ee 100644
--- a/test/stressProof.cxx
+++ b/test/stressProof.cxx
@@ -3650,7 +3650,7 @@ Int_t PT_AdminFunc(void *, RunTimes &tt)
return -1;
}
// Reference checksum
- std::auto_ptr<TMD5> testMacroMd5(testMacro.Checksum());
+ std::unique_ptr<TMD5> testMacroMd5(testMacro.Checksum());
if (!testMacroMd5.get()) {
// MD5 sum not calculated
printf("\n >>> Test failure: could not calculate the md5 sum of the test macro\n");
@@ -3719,7 +3719,7 @@ Int_t PT_AdminFunc(void *, RunTimes &tt)
macroMore.GetListOfLines()->Remove(macroMore.GetListOfLines()->First());
os = (TObjString *) macroMore.GetListOfLines()->First();
}
- std::auto_ptr<TMD5> testMoreMd5(macroMore.Checksum());
+ std::unique_ptr<TMD5> testMoreMd5(macroMore.Checksum());
if (!testMoreMd5.get()) {
// MD5 sum not calculated
printf("\n >>> Test failure: could not calculate the md5 sum of the 'more' result\n");
diff --git a/tmva/tmva/src/MsgLogger.cxx b/tmva/tmva/src/MsgLogger.cxx
index 69fd4bc90a2..6c70bda5e72 100644
--- a/tmva/tmva/src/MsgLogger.cxx
+++ b/tmva/tmva/src/MsgLogger.cxx
@@ -62,8 +62,8 @@ Bool_t TMVA::MsgLogger::fgInhibitOutput =
const std::map<TMVA::EMsgType, std::string>* TMVA::MsgLogger::fgTypeMap = 0;
const std::map<TMVA::EMsgType, std::string>* TMVA::MsgLogger::fgColorMap = 0;
#endif
-static std::auto_ptr<const std::map<TMVA::EMsgType, std::string> > gOwnTypeMap;
-static std::auto_ptr<const std::map<TMVA::EMsgType, std::string> > gOwnColorMap;
+static std::unique_ptr<const std::map<TMVA::EMsgType, std::string> > gOwnTypeMap;
+static std::unique_ptr<const std::map<TMVA::EMsgType, std::string> > gOwnColorMap;
void TMVA::MsgLogger::InhibitOutput() { fgInhibitOutput = kTRUE; }
--
GitLab