Skip to content

Bugfix #2514 develop clang #2563

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
merged 2 commits into from
Jun 12, 2023
Merged

Bugfix #2514 develop clang #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d2de26
Per #2514, porting minor changes to enable MET to compile with clang …
JohnHalleyGotway Jun 9, 2023
3307d01
Merge remote-tracking branch 'origin/develop' into bugfix_2514_develo…
JohnHalleyGotway Jun 12, 2023
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 src/basic/vx_log/concat_string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class ConcatString {

void chomp(const char *); // removes trailing suffix, if possible

operator const std::string () const;
operator std::string() const;

bool startswith(const char *) const;
bool endswith(const char *) const;
Expand Down Expand Up @@ -205,7 +205,7 @@ inline const char * ConcatString::float_format() const { return ( FloatFormat );
inline bool ConcatString::empty() const { return ( s ? s->empty() : true ); }
inline bool ConcatString::nonempty() const { return ( s ? !s->empty() : false ); }

inline ConcatString::operator const std::string () const { return ( s ? *s : 0 ); }
inline ConcatString::operator std::string() const { return ( s ? *s : 0 ); }


////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/basic/vx_util/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ void set_handlers() {

void set_user_id() {
met_user_id = geteuid ();
register struct passwd *pw;
struct passwd *pw;
pw = getpwuid (met_user_id);
if (pw) met_user_name = string(pw->pw_name);
}
Expand Down