Skip to content

Revert "Replace a few more deprecated pre-C++11 styles" #2044

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
peternewman merged 1 commit into from
Apr 18, 2026
Merged

Revert "Replace a few more deprecated pre-C++11 styles" #2044

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/utils/StringUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,12 +454,12 @@ bool HexStringToInt(const string &value, int64_t *output) {

void ToLower(string *s) {
std::transform(s->begin(), s->end(), s->begin(),
[](int value){return std::tolower(value);});
std::ptr_fun<int, int>(std::tolower));
}

void ToUpper(string *s) {
std::transform(s->begin(), s->end(), s->begin(),
[](int value){return std::toupper(value);});
std::ptr_fun<int, int>(std::toupper));
}

void CapitalizeLabel(string *s) {
Expand Down
3 changes: 2 additions & 1 deletion include/ola/ExportMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ class BaseVariable {
std::string m_name;
};

struct VariableLessThan {
struct VariableLessThan: public std::binary_function<BaseVariable*,
BaseVariable*, bool> {
Copy link
Copy Markdown
Contributor

@aroffringa aroffringa Apr 18, 2026

Choose a reason for hiding this comment

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

Technically you don't have to revert this line as the fix was just to remove the (deprecated) base class, which doesn't affect the code otherwise. However, it might be useful to keep the PR as one whole..

Copy link
Copy Markdown
Member Author

@peternewman peternewman Apr 18, 2026

Choose a reason for hiding this comment

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

Yeah, and I did find I only needed to undo a subset of the changes across both to fix it, but that feels like more pain than it's worth IMHO, the reverts always seem to end up a nightmare either way...

Copy link
Copy Markdown
Contributor

@aroffringa aroffringa Apr 18, 2026

Choose a reason for hiding this comment

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

👍

bool operator()(BaseVariable *x, BaseVariable *y) {
return x->Name() < y->Name();
}
Expand Down
3 changes: 2 additions & 1 deletion include/olad/Plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ class AbstractPlugin {
};


struct PluginLessThan {
struct PluginLessThan: public std::binary_function<AbstractPlugin*,
AbstractPlugin*, bool> {
bool operator()(AbstractPlugin *x, AbstractPlugin *y) {
return x->Id() < y->Id();
}
Expand Down
Loading