projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: g++ 4.8 doesn't support non-trivial designated initializers
[lttng-tools.git]
/
src
/
common
/
payload-view.cpp
diff --git
a/src/common/payload-view.cpp
b/src/common/payload-view.cpp
index b1a44368da2001916b4f977d04865d5b2f97390a..3ea043c8aa0c7fb4a9051a890e020465f09d8636 100644
(file)
--- a/
src/common/payload-view.cpp
+++ b/
src/common/payload-view.cpp
@@
-24,7
+24,10
@@
struct lttng_payload_view lttng_payload_view_from_payload(
.buffer = lttng_buffer_view_from_dynamic_buffer(
&payload->buffer, offset, len),
._fd_handles = payload->_fd_handles,
.buffer = lttng_buffer_view_from_dynamic_buffer(
&payload->buffer, offset, len),
._fd_handles = payload->_fd_handles,
- } : (struct lttng_payload_view) {};
+ } : (struct lttng_payload_view) {
+ .buffer = {},
+ ._fd_handles = {}
+ };
}
struct lttng_payload_view lttng_payload_view_from_view(
}
struct lttng_payload_view lttng_payload_view_from_view(
@@
-39,7
+42,10
@@
struct lttng_payload_view lttng_payload_view_from_view(
.p_fd_handles_position = view->_iterator.p_fd_handles_position ?:
&view->_iterator.fd_handles_position,
}
.p_fd_handles_position = view->_iterator.p_fd_handles_position ?:
&view->_iterator.fd_handles_position,
}
- } : (struct lttng_payload_view) {};
+ } : (struct lttng_payload_view) {
+ .buffer = {},
+ ._fd_handles = {}
+ };
}
struct lttng_payload_view lttng_payload_view_from_dynamic_buffer(
}
struct lttng_payload_view lttng_payload_view_from_dynamic_buffer(
@@
-48,8
+54,12
@@
struct lttng_payload_view lttng_payload_view_from_dynamic_buffer(
{
return buffer ? (struct lttng_payload_view) {
.buffer = lttng_buffer_view_from_dynamic_buffer(
{
return buffer ? (struct lttng_payload_view) {
.buffer = lttng_buffer_view_from_dynamic_buffer(
- buffer, offset, len)
- } : (struct lttng_payload_view) {};
+ buffer, offset, len),
+ ._fd_handles = {}
+ } : (struct lttng_payload_view) {
+ .buffer = {},
+ ._fd_handles = {}
+ };
}
struct lttng_payload_view lttng_payload_view_from_buffer_view(
}
struct lttng_payload_view lttng_payload_view_from_buffer_view(
@@
-58,8
+68,12
@@
struct lttng_payload_view lttng_payload_view_from_buffer_view(
{
return view ? (struct lttng_payload_view) {
.buffer = lttng_buffer_view_from_view(
{
return view ? (struct lttng_payload_view) {
.buffer = lttng_buffer_view_from_view(
- view, offset, len)
- } : (struct lttng_payload_view) {};
+ view, offset, len),
+ ._fd_handles = {}
+ } : (struct lttng_payload_view) {
+ .buffer = {},
+ ._fd_handles = {}
+ };
}
struct lttng_payload_view lttng_payload_view_init_from_buffer(
}
struct lttng_payload_view lttng_payload_view_init_from_buffer(
@@
-67,7
+81,8
@@
struct lttng_payload_view lttng_payload_view_init_from_buffer(
{
return (struct lttng_payload_view) {
.buffer = lttng_buffer_view_init(
{
return (struct lttng_payload_view) {
.buffer = lttng_buffer_view_init(
- src, offset, len)
+ src, offset, len),
+ ._fd_handles = {}
};
}
};
}
This page took
0.023004 seconds
and
4
git commands to generate.