Skip to content

fix(ofParameter): ctor refinements for std::string #8279

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

Merged
danoli3 merged 1 commit into from
Feb 25, 2025
Merged

fix(ofParameter): ctor refinements for std::string #8279

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions libs/openFrameworks/types/ofParameter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,16 +514,24 @@ class ofParameter : public ofAbstractParameter {

/// \brief constructs an ofParameter of type ParameterType initialized to value of v
/// where v is convertible to ParameterType, with an exception for bool which can cause
/// unexpected behavious (as string and char arrays are convertible to bool)
/// unexpected behavious (as string and char arrays are convertible to bool) and
/// the exception of a single string-convertible argument with std::string ParameterType
/// \tparam ParameterType the type of the value held by the ofParameter
/// \tparam Arg a type convertible to ParameterType
/// \param v the value to initialize to
template <
typename Arg,
typename = std::enable_if_t<(std::is_convertible_v<Arg, ParameterType> and
typename = std::enable_if_t<(!(std::is_convertible_v<Arg, std::string> and std::is_same_v<ParameterType, std::string>) and
std::is_convertible_v<Arg, ParameterType> and
!((std::is_same_v<ParameterType, bool>)and!(std::is_arithmetic_v<Arg>)))>>
ofParameter(const Arg & v);

/// \brief constructs an ofParameter<std::string> initialized to value of v
/// \tparam ParameterType the type of the value held by the ofParameter
/// \param v the string value to initialize to
template <typename U = ParameterType, typename = std::enable_if_t<std::is_same_v<U, std::string>>>
ofParameter(const std::string & v);

/// \brief constructs a named ofParameter of type ParameterType initialized to value of v
/// \tparam ParameterType the type of the value held by the ofParameter
/// \param name name of the parameter
Expand Down Expand Up @@ -724,6 +732,12 @@ ofParameter<ParameterType>::ofParameter(const Arg & v)
: obj(std::make_shared<Value>(v))
, setMethod(std::bind(&ofParameter<ParameterType>::eventsSetValue, this, std::placeholders::_1)) { }

template <typename ParameterType>
template <typename U, typename>
ofParameter<ParameterType>::ofParameter(const std::string & v)
: obj(std::make_shared<Value>(v))
, setMethod(std::bind(&ofParameter<std::string>::eventsSetValue, this, std::placeholders::_1)) { }

template <typename ParameterType>
ofParameter<ParameterType>::ofParameter(const std::string & name, const ParameterType & v)
: obj(std::make_shared<Value>(name, v))
Expand Down