Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
e6c56749
Commit
e6c56749
authored
Jul 08, 2018
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix string_view::compare for substring comparison
parent
5625d2b8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
libcaf_core/src/string_view.cpp
libcaf_core/src/string_view.cpp
+14
-1
libcaf_core/test/string_view.cpp
libcaf_core/test/string_view.cpp
+3
-1
No files found.
libcaf_core/src/string_view.cpp
View file @
e6c56749
...
@@ -101,7 +101,20 @@ string_view string_view::substr(size_type pos, size_type n) const noexcept {
...
@@ -101,7 +101,20 @@ string_view string_view::substr(size_type pos, size_type n) const noexcept {
}
}
int
string_view
::
compare
(
string_view
str
)
const
noexcept
{
int
string_view
::
compare
(
string_view
str
)
const
noexcept
{
auto
s0
=
size
();
auto
s1
=
str
.
size
();
if
(
s0
==
s1
)
{
return
strncmp
(
data
(),
str
.
data
(),
std
::
min
(
size
(),
str
.
size
()));
return
strncmp
(
data
(),
str
.
data
(),
std
::
min
(
size
(),
str
.
size
()));
}
else
if
(
s0
<
s1
)
{
auto
res
=
strncmp
(
data
(),
str
.
data
(),
std
::
min
(
size
(),
str
.
size
()));
if
(
res
==
0
)
return
-
1
;
}
else
{
auto
res
=
strncmp
(
data
(),
str
.
data
(),
std
::
min
(
size
(),
str
.
size
()));
if
(
res
==
0
)
return
1
;
}
return
0
;
}
}
int
string_view
::
compare
(
size_type
pos1
,
size_type
n1
,
int
string_view
::
compare
(
size_type
pos1
,
size_type
n1
,
...
...
libcaf_core/test/string_view.cpp
View file @
e6c56749
...
@@ -99,7 +99,9 @@ CAF_TEST(compare) {
...
@@ -99,7 +99,9 @@ CAF_TEST(compare) {
CAF_CHECK
(
x
.
compare
(
0
,
3
,
"abc"
)
==
0
);
CAF_CHECK
(
x
.
compare
(
0
,
3
,
"abc"
)
==
0
);
CAF_CHECK
(
x
.
compare
(
1
,
2
,
y
,
0
,
2
)
==
0
);
CAF_CHECK
(
x
.
compare
(
1
,
2
,
y
,
0
,
2
)
==
0
);
CAF_CHECK
(
x
.
compare
(
2
,
1
,
z
,
0
,
1
)
==
0
);
CAF_CHECK
(
x
.
compare
(
2
,
1
,
z
,
0
,
1
)
==
0
);
CAF_CHECK
(
x
.
compare
(
2
,
1
,
z
,
0
,
2
)
==
0
);
CAF_CHECK
(
x
.
compare
(
2
,
1
,
z
,
0
,
1
)
==
0
);
// make sure substrings aren't equal
CAF_CHECK
(
string_view
(
"a/"
)
!=
string_view
(
"a/b"
));
}
}
CAF_TEST
(
copy
)
{
CAF_TEST
(
copy
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment