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
4883df85
Unverified
Commit
4883df85
authored
Jun 18, 2023
by
Dominik Charousset
Committed by
GitHub
Jun 18, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1445
Add missing compare overload
parents
88c27ab5
6c56bc17
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
10 deletions
+26
-10
CHANGELOG.md
CHANGELOG.md
+6
-0
libcaf_core/caf/telemetry/label.hpp
libcaf_core/caf/telemetry/label.hpp
+9
-1
libcaf_core/caf/telemetry/label_view.hpp
libcaf_core/caf/telemetry/label_view.hpp
+2
-2
libcaf_core/src/telemetry/label.cpp
libcaf_core/src/telemetry/label.cpp
+5
-1
libcaf_core/src/telemetry/label_view.cpp
libcaf_core/src/telemetry/label_view.cpp
+4
-6
No files found.
CHANGELOG.md
View file @
4883df85
...
@@ -6,6 +6,12 @@ is based on [Keep a Changelog](https://keepachangelog.com).
...
@@ -6,6 +6,12 @@ is based on [Keep a Changelog](https://keepachangelog.com).
## [Unreleased]
## [Unreleased]
### Added
-
The class
`caf::telemetry::label`
now has a new
`compare`
overload that
accepts a
`caf::telemetry::label_view`
to make the interface of the both
classes symmetrical.
### Changed
### Changed
-
When using CAF to parse CLI arguments, the output of
`--help`
now includes all
-
When using CAF to parse CLI arguments, the output of
`--help`
now includes all
...
...
libcaf_core/caf/telemetry/label.hpp
View file @
4883df85
...
@@ -53,7 +53,15 @@ public:
...
@@ -53,7 +53,15 @@ public:
// -- comparison -------------------------------------------------------------
// -- comparison -------------------------------------------------------------
int
compare
(
const
label
&
x
)
const
noexcept
;
template
<
class
T1
,
class
T2
>
static
int
compare
(
const
T1
&
lhs
,
const
T2
&
rhs
)
noexcept
{
auto
cmp1
=
lhs
.
name
().
compare
(
rhs
.
name
());
return
cmp1
!=
0
?
cmp1
:
lhs
.
value
().
compare
(
rhs
.
value
());
}
int
compare
(
const
label_view
&
other
)
const
noexcept
;
int
compare
(
const
label
&
other
)
const
noexcept
;
private:
private:
size_t
name_length_
;
size_t
name_length_
;
...
...
libcaf_core/caf/telemetry/label_view.hpp
View file @
4883df85
...
@@ -42,9 +42,9 @@ public:
...
@@ -42,9 +42,9 @@ public:
// -- comparison -------------------------------------------------------------
// -- comparison -------------------------------------------------------------
int
compare
(
const
label
&
x
)
const
noexcept
;
int
compare
(
const
label
&
other
)
const
noexcept
;
int
compare
(
const
label_view
&
x
)
const
noexcept
;
int
compare
(
const
label_view
&
other
)
const
noexcept
;
private:
private:
std
::
string_view
name_
;
std
::
string_view
name_
;
...
...
libcaf_core/src/telemetry/label.cpp
View file @
4883df85
...
@@ -25,8 +25,12 @@ void label::value(std::string_view new_value) {
...
@@ -25,8 +25,12 @@ void label::value(std::string_view new_value) {
str_
.
insert
(
str_
.
end
(),
new_value
.
begin
(),
new_value
.
end
());
str_
.
insert
(
str_
.
end
(),
new_value
.
begin
(),
new_value
.
end
());
}
}
int
label
::
compare
(
const
label_view
&
x
)
const
noexcept
{
return
compare
(
*
this
,
x
);
}
int
label
::
compare
(
const
label
&
x
)
const
noexcept
{
int
label
::
compare
(
const
label
&
x
)
const
noexcept
{
return
str_
.
compare
(
x
.
str
()
);
return
compare
(
*
this
,
x
);
}
}
std
::
string
to_string
(
const
label
&
x
)
{
std
::
string
to_string
(
const
label
&
x
)
{
...
...
libcaf_core/src/telemetry/label_view.cpp
View file @
4883df85
...
@@ -8,14 +8,12 @@
...
@@ -8,14 +8,12 @@
namespace
caf
::
telemetry
{
namespace
caf
::
telemetry
{
int
label_view
::
compare
(
const
label_view
&
x
)
const
noexcept
{
int
label_view
::
compare
(
const
label_view
&
other
)
const
noexcept
{
auto
cmp1
=
name
().
compare
(
x
.
name
());
return
label
::
compare
(
*
this
,
other
);
return
cmp1
!=
0
?
cmp1
:
value
().
compare
(
x
.
value
());
}
}
int
label_view
::
compare
(
const
label
&
x
)
const
noexcept
{
int
label_view
::
compare
(
const
label
&
other
)
const
noexcept
{
auto
cmp1
=
name
().
compare
(
x
.
name
());
return
label
::
compare
(
*
this
,
other
);
return
cmp1
!=
0
?
cmp1
:
value
().
compare
(
x
.
value
());
}
}
std
::
string
to_string
(
const
label_view
&
x
)
{
std
::
string
to_string
(
const
label_view
&
x
)
{
...
...
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