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.

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

Merge Properties and PropertiesI, switch to string_view #1914

Merged
merged 5 commits into from
Mar 7, 2024

Conversation

bernardnormier
Copy link
Member

This PR merges Properties and PropertiesI and replaces "const string&" by string_view in the Properties API.

@@ -13,11 +13,14 @@
#include "Initialize.h"
#include "PluginF.h"
#include "Properties.h"
#include "ProxyF.h"
#include "Proxy.h"
Copy link
Member Author

Choose a reason for hiding this comment

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

My cleanup of the headers included by Properties.h revealed a bug in this include list.

@@ -117,7 +117,7 @@ ICE_API PropertiesPtr createProperties();
* @return A new property set initialized with the property settings
* that were removed from the argument vector.
*/
ICE_API PropertiesPtr createProperties(StringSeq& seq, const PropertiesPtr& defaults = 0);
ICE_API PropertiesPtr createProperties(StringSeq& seq, const PropertiesPtr& defaults = nullptr);
Copy link
Member Author

Choose a reason for hiding this comment

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

I am wonder if we should just remove these functions that are now equivalent to a call to make_shared<Properties>(...)

_properties = p._properties;
}

Ice::Properties::Properties(StringSeq& args, const PropertiesPtr& defaults)
Copy link
Member Author

Choose a reason for hiding this comment

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

It's just the implementation that was in PropertiesI - I didn't change anything.

Copy link
Member

@externl externl left a comment

Choose a reason for hiding this comment

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

Looks good!

cpp/src/Ice/Properties.cpp Outdated Show resolved Hide resolved
@bernardnormier bernardnormier merged commit 7e05796 into zeroc-ice:main Mar 7, 2024
4 checks passed
@bernardnormier bernardnormier deleted the property-view branch May 10, 2024 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants