projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: replace container_of with a C++ safe implementation
[lttng-tools.git]
/
src
/
common
/
session-descriptor.cpp
diff --git
a/src/common/session-descriptor.cpp
b/src/common/session-descriptor.cpp
index 642c6399fc6e7728693a2d27ff07326b9ded2432..1171b2930ce605c2ee465476cd5d4541cd48a646 100644
(file)
--- a/
src/common/session-descriptor.cpp
+++ b/
src/common/session-descriptor.cpp
@@
-847,9
+847,8
@@
int lttng_session_descriptor_serialize(
header.base.uri_count = uri_count;
if (descriptor->type == LTTNG_SESSION_DESCRIPTOR_TYPE_LIVE) {
header.base.uri_count = uri_count;
if (descriptor->type == LTTNG_SESSION_DESCRIPTOR_TYPE_LIVE) {
- const struct lttng_session_descriptor_live *live =
- container_of(descriptor, typeof(*live),
- base);
+ const struct lttng_session_descriptor_live *live = lttng::utils::container_of(
+ descriptor, <tng_session_descriptor_live::base);
header.live_timer_us = live->live_timer_us;
header_ptr = &header;
header.live_timer_us = live->live_timer_us;
header_ptr = &header;
@@
-918,7
+917,7
@@
lttng_session_descriptor_live_get_timer_interval(
{
struct lttng_session_descriptor_live *live;
{
struct lttng_session_descriptor_live *live;
- live =
container_of(descriptor, typeof(*live),
base);
+ live =
lttng::utils::container_of(descriptor, <tng_session_descriptor_live::
base);
return live->live_timer_us;
}
return live->live_timer_us;
}
This page took
0.024214 seconds
and
4
git commands to generate.