Merge pull request #11 from lsst/tickets/DM-5879

DM-5879 Remove use of Boost smart pointers throughout the Science Pipelines
lsst · May 4, 2016 · 92a194c · 92a194c
2 parents 806b452 + ceda6d1
commit 92a194c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/include/lsst/ip/isr.h b/include/lsst/ip/isr.h
@@ -42,11 +42,10 @@
 #ifndef LSST_IP_ISR_ISR_H
 #define LSST_IP_ISR_ISR_H
 
+#include <memory>
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
 #include <lsst/afw/math.h>
 #include <lsst/afw/math/Statistics.h>
 #include <lsst/afw/image.h>
@@ -206,7 +205,7 @@ namespace isr {
 
     template<typename ImagePixelT, typename FunctionT>
     void fitOverscanImage(
-        boost::shared_ptr<lsst::afw::math::Function1<FunctionT> > &overscanFunction,
+        std::shared_ptr<lsst::afw::math::Function1<FunctionT> > &overscanFunction,
         lsst::afw::image::MaskedImage<ImagePixelT> const& overscan,
         double ssize=1.,
         int sigma=1

diff --git a/python/lsst/ip/isr/isrLib.i b/python/lsst/ip/isr/isrLib.i
@@ -37,7 +37,7 @@ Python bindings for lsst::ip::isr Instrument Signature Removal code
 
 // Everything we will need in the _wrap.cc file
 %{
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "lsst/pex/exceptions.h"
 #include "lsst/pex/logging.h"

diff --git a/src/Isr.cc b/src/Isr.cc
@@ -77,7 +77,7 @@ size_t maskNans(afw::image::MaskedImage<PixelT> const& mi, afw::image::MaskPixel
 
 template<typename ImagePixelT, typename FunctionT>
 void fitOverscanImage(
-    boost::shared_ptr< afw::math::Function1<FunctionT> > &overscanFunction,
+    std::shared_ptr< afw::math::Function1<FunctionT> > &overscanFunction,
     afw::image::MaskedImage<ImagePixelT> const& overscan,
     double ssize,
     int sigma
@@ -142,14 +142,14 @@ std::string between(std::string &s, char ldelim, char rdelim) {
 
 template
 void fitOverscanImage(
-     boost::shared_ptr<afw::math::Function1<double> > &overscanFunction, 
+     std::shared_ptr<afw::math::Function1<double> > &overscanFunction, 
     afw::image::MaskedImage<float> const& overscan,
     double ssize,
     int sigma);
 
 template
 void fitOverscanImage(
-     boost::shared_ptr<afw::math::Function1<double> > &overscanFunction,
+     std::shared_ptr<afw::math::Function1<double> > &overscanFunction,
     afw::image::MaskedImage<double> const& overscan,
     double ssize,
     int sigma);