Changeset 3121

Timestamp:

05/16/17 14:07:28 (8 years ago)

Author:

Malte Marquarding

Message:

shared_ptr now in std namespace

Location:

trunk/external-alma/components/SpectralComponents

Files:

• CompiledSpectralElement.cc (modified) (2 diffs)
• GaussianSpectralElement.cc (modified) (3 diffs)
• LorentzianSpectralElement.cc (modified) (3 diffs)
• PCFSpectralElement.cc (modified) (1 diff)
• PolynomialSpectralElement.cc (modified) (3 diffs)
• PowerLogPolynomialSpectralElement.cc (modified) (2 diffs)

trunk/external-alma/components/SpectralComponents/CompiledSpectralElement.cc

@@ -105 +105 @@
 const String& CompiledSpectralElement::getFunction() const {
         // return _function;
-        std::tr1::shared_ptr<Function<Double, Double> >  f = _getFunction();
+        std::shared_ptr<Function<Double, Double> >  f = _getFunction();
         return dynamic_cast<CompiledFunction<Double> *>(SpectralElement::_getFunction().get())->getText();
 }
@@ -112 +112 @@
 void CompiledSpectralElement::_setFunction(const String& function) {
         //_function = function;
-        std::tr1::shared_ptr<Function<Double, Double> > f = _getFunction();
+        std::shared_ptr<Function<Double, Double> > f = _getFunction();
         CompiledFunction<Double> *cf = f.get() == 0
                 ? new CompiledFunction<Double>()

trunk/external-alma/components/SpectralComponents/GaussianSpectralElement.cc

@@ -43 +43 @@
 : PCFSpectralElement(SpectralElement::GAUSSIAN, 1, 0, 2*sqrt(C::ln2)/C::pi) {
         _setFunction(
-                std::tr1::shared_ptr<Gaussian1D<Double> >(
+                std::shared_ptr<Gaussian1D<Double> >(
                         new Gaussian1D<Double>(1, 0, 1)
                 )
@@ -54 +54 @@
 ) : PCFSpectralElement(SpectralElement::GAUSSIAN, ampl, center, sigma) {
         _setFunction(
-                std::tr1::shared_ptr<Gaussian1D<Double> >(
+                std::shared_ptr<Gaussian1D<Double> >(
                         new Gaussian1D<Double>(ampl, center, sigma*SigmaToFWHM)
                 )
@@ -63 +63 @@
         const Vector<Double> &param
 ) : PCFSpectralElement(SpectralElement::GAUSSIAN, param) {
-        std::tr1::shared_ptr<Gaussian1D<Double> >(
+        std::shared_ptr<Gaussian1D<Double> >(
                 new Gaussian1D<Double>(param[AMP], param[CENTER], param[WIDTH]*SigmaToFWHM)
         );

trunk/external-alma/components/SpectralComponents/LorentzianSpectralElement.cc

@@ -40 +40 @@
 : PCFSpectralElement(SpectralElement::LORENTZIAN, Vector<Double>(3)) {
         _setFunction(
-                std::tr1::shared_ptr<Lorentzian1D<Double> >(
+                std::shared_ptr<Lorentzian1D<Double> >(
                         new Lorentzian1D<Double>(1)
                 )
@@ -57 +57 @@
         }
         _setFunction(
-                std::tr1::shared_ptr<Lorentzian1D<Double> >(
+                std::shared_ptr<Lorentzian1D<Double> >(
                         new Lorentzian1D<Double>(ampl, center, fwhm)
                 )
@@ -70 +70 @@
         }
         _setFunction(
-                std::tr1::shared_ptr<Lorentzian1D<Double> >(
+                std::shared_ptr<Lorentzian1D<Double> >(
                         new Lorentzian1D<Double>(param[AMP], param[CENTER], param[WIDTH])
                 )

trunk/external-alma/components/SpectralComponents/PCFSpectralElement.cc

@@ -207 +207 @@
         // own functions in their constructors
         _setFunction(
-                std::tr1::shared_ptr<Function<Double> >(
+                std::shared_ptr<Function<Double> >(
                         new Gaussian1D<Double>()
                 )

trunk/external-alma/components/SpectralComponents/PolynomialSpectralElement.cc

@@ -38 +38 @@
 : SpectralElement(SpectralElement::POLYNOMIAL, Vector<Double>(0)) {
         _setFunction(
-                std::tr1::shared_ptr<Polynomial<Double> >(
+                std::shared_ptr<Polynomial<Double> >(
                         new Polynomial<Double>()
                 )
@@ -47 +47 @@
   : SpectralElement(SpectralElement::POLYNOMIAL, Vector<Double>(n+1, 0.)) {
         _setFunction(
-                std::tr1::shared_ptr<Polynomial<Double> >(
+                std::shared_ptr<Polynomial<Double> >(
                         new Polynomial<Double>(n)
                 )
@@ -56 +56 @@
 : SpectralElement(SpectralElement::POLYNOMIAL, param) {
         _setFunction(
-                std::tr1::shared_ptr<Polynomial<Double> >(
+                std::shared_ptr<Polynomial<Double> >(
                         new Polynomial<Double>(param.size())
                 )

trunk/external-alma/components/SpectralComponents/PowerLogPolynomialSpectralElement.cc

@@ -46 +46 @@
         //_makeFunction();
         _setFunction(
-                std::tr1::shared_ptr<PowerLogarithmicPolynomial<Double> >(
+                std::shared_ptr<PowerLogarithmicPolynomial<Double> >(
                         new PowerLogarithmicPolynomial(n)
                 )
@@ -57 +57 @@
         //_makeFunction();
         _setFunction(
-                std::tr1::shared_ptr<PowerLogarithmicPolynomial<Double> >(
+                std::shared_ptr<PowerLogarithmicPolynomial<Double> >(
                         new PowerLogarithmicPolynomial<Double>(param.tovector())
                 )