Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-34195: Remove deprecated shared_ptr interfaces #81

Merged
merged 1 commit into from
Jul 12, 2023
Merged

DM-34195: Remove deprecated shared_ptr interfaces #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions include/lsst/daf/base/PropertyList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,16 +281,11 @@ 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);
//@}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to remove the opening //@{, too.


//@{
/// @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
Expand Down
5 changes: 0 additions & 5 deletions include/lsst/daf/base/PropertySet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,9 +438,6 @@ 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);
//@}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to remove the opening //@{, too.


//@{
Expand All @@ -458,8 +455,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);
//@}

/**
Expand Down
12 changes: 0 additions & 12 deletions src/PropertyList.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
13 changes: 0 additions & 13 deletions src/PropertySet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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('.');
Expand Down