Remove deprecated shared_ptr interfaces

lsst · Jul 10, 2023 · d960eaf · d960eaf
1 parent e021ae4
commit d960eaf
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 41 deletions.
diff --git a/include/lsst/daf/base/PropertyList.h b/include/lsst/daf/base/PropertyList.h
@@ -281,17 +281,9 @@ class LSST_EXPORT PropertyList : public PropertySet {
     /// @copydoc PropertySet::copy
     virtual void copy(std::string const& dest, PropertySet const & source, std::string const& name,
                       bool asScalar = false);
-    [[deprecated("Replaced by a non-shared_ptr overload.  Will be removed after v25.")]]
-    virtual void copy(std::string const& dest, std::shared_ptr<PropertySet const> source,
-                      std::string const& name, bool asScalar = false);
-    //@}
 
-    //@{
     /// @copydoc PropertySet::combine
     virtual void combine(PropertySet const & source);
-    [[deprecated("Replaced by a non-shared_ptr overload.  Will be removed after v25.")]]
-    virtual void combine(std::shared_ptr<PropertySet const> source);
-    //@}
 
     /// @copydoc PropertySet::remove
     virtual void remove(std::string const& name);

diff --git a/include/lsst/daf/base/PropertySet.h b/include/lsst/daf/base/PropertySet.h
@@ -438,12 +438,7 @@ class LSST_EXPORT PropertySet {
      */
     virtual void copy(std::string const& dest, PropertySet const & source, std::string const& name,
                       bool asScalar = false);
-    [[deprecated("Replaced by a non-shared_ptr overload.  Will be removed after v25.")]]
-    virtual void copy(std::string const& dest, std::shared_ptr<PropertySet const> source,
-                      std::string const& name, bool asScalar = false);
-    //@}
 
-    //@{
     /**
      * Append all value vectors from the \a source to their corresponding
      * properties.  Sets values if a property does not exist.
@@ -458,9 +453,6 @@ class LSST_EXPORT PropertySet {
      * @warning May only partially combine the PropertySets if an exception occurs.
      */
     virtual void combine(PropertySet const & source);
-    [[deprecated("Replaced by a non-shared_ptr overload.  Will be removed after v25.")]]
-    virtual void combine(std::shared_ptr<PropertySet const> source);
-    //@}
 
     /**
      * Remove all values for a property name (possibly hierarchical).  Does

diff --git a/src/PropertyList.cc b/src/PropertyList.cc
@@ -193,12 +193,6 @@ void PropertyList::copy(std::string const& dest, PropertySet const & source, std
     }
 }
 
-void PropertyList::copy(std::string const& dest, std::shared_ptr<PropertySet const> source,
-                        std::string const& name, bool asScalar) {
-    if (source) {
-        copy(dest, *source, name, asScalar);
-    }
-}
 
 void PropertyList::combine(PropertySet const & source) {
     auto const * pl = dynamic_cast<PropertyList const *>(&source);
@@ -221,12 +215,6 @@ void PropertyList::combine(PropertySet const & source) {
     }
 }
 
-void PropertyList::combine(std::shared_ptr<PropertySet const> source) {
-    if (!source) {
-        return;
-    }
-    combine(*source);
-}
 
 void PropertyList::remove(std::string const& name) {
     PropertySet::remove(name);

diff --git a/src/PropertySet.cc b/src/PropertySet.cc
@@ -572,13 +572,6 @@ void PropertySet::copy(
     }
 }
 
-void PropertySet::copy(std::string const& dest, std::shared_ptr<PropertySet const> source,
-                       std::string const& name, bool asScalar) {
-    if (!source) {
-        throw LSST_EXCEPT(pex::exceptions::InvalidParameterError, "Missing source");
-    }
-    copy(dest, *source, name, asScalar);
-}
 
 void PropertySet::combine(PropertySet const & source) {
     std::vector<std::string> names = source.paramNames(false);
@@ -588,12 +581,6 @@ void PropertySet::combine(PropertySet const & source) {
     }
 }
 
-void PropertySet::combine(std::shared_ptr<PropertySet const> source) {
-    if (!source) {
-        return;
-    }
-    combine(*source);
-}
 
 void PropertySet::remove(std::string const& name) {
     std::string::size_type i = name.find('.');