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

Fix word boundary assertions under C++20 #345

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Fix word boundary assertions under C++20 #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2060dd3
Merge branch develop to master
xiangwang1 Jul 9, 2018
90cd186
Merge branch develop to master
fatchanghao Jan 30, 2019
7729ade
Merge branch develop to master
xiangwang1 Apr 10, 2019
4cebdaa
Merge branch develop to master
fatchanghao Aug 13, 2019
d79973e
Merge branch 'github_develop' into github_master
hongyang7 Oct 30, 2019
c00683d
Merge branch 'github_develop' into github_master
hongyang7 May 25, 2020
64a995b
Merge branch 'github_develop' into github_master
hongyang7 Jan 13, 2021
f2fdb3b
fix: Mark operator bool explicit
BigRedEye Jan 8, 2022
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/rose/rose_graph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ struct LeftEngInfo {
}
size_t hash() const;
void reset(void);
operator bool() const;
explicit operator bool() const;
bool tracksSom() const { return !!haig; }
};

Expand All @@ -133,7 +133,7 @@ struct RoseSuffixInfo {
bool operator<(const RoseSuffixInfo &b) const;
size_t hash() const;
void reset(void);
operator bool() const { return graph || castle || haig || rdfa || tamarama; }
explicit operator bool() const { return graph || castle || haig || rdfa || tamarama; }
};

/** \brief Properties attached to each Rose graph vertex. */
Expand Down
2 changes: 1 addition & 1 deletion src/util/ue2_graph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class vertex_descriptor : totally_ordered<vertex_descriptor<Graph>> {
vertex_descriptor() : p(nullptr), serial(0) {}
explicit vertex_descriptor(vertex_node *pp) : p(pp), serial(pp->serial) {}

operator bool() const { return p; }
explicit operator bool() const { return p; }
bool operator<(const vertex_descriptor b) const {
if (p && b.p) {
/* no vertices in the same graph can have the same serial */
Expand Down