projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use compiler-agnostic defines to silence warning
[lttng-tools.git]
/
src
/
common
/
optional.hpp
diff --git
a/src/common/optional.hpp
b/src/common/optional.hpp
index 4bb774739a8aa870c03aa328040690e9a725e3a8..69bba5be54254041b89e8f3f0213ac4e4d18ad9a 100644
(file)
--- a/
src/common/optional.hpp
+++ b/
src/common/optional.hpp
@@
-37,10
+37,10
@@
*
* LTTNG_OPTIONAL_UNSET(&foo.b);
*/
*
* LTTNG_OPTIONAL_UNSET(&foo.b);
*/
-#define LTTNG_OPTIONAL(type) \
- struct { \
+#define LTTNG_OPTIONAL(type)
\
+ struct {
\
uint8_t is_set; \
uint8_t is_set; \
- type value; \
+ type value;
\
}
/*
}
/*
@@
-60,10
+60,10
@@
* Since this returns the 'optional' by value, it is not suitable for all
* wrapped optional types. It is meant to be used with PODs.
*/
* Since this returns the 'optional' by value, it is not suitable for all
* wrapped optional types. It is meant to be used with PODs.
*/
-#define LTTNG_OPTIONAL_GET(optional)
\
- ({
\
- LTTNG_ASSERT((optional).is_set);
\
- (optional).value;
\
+#define LTTNG_OPTIONAL_GET(optional) \
+ ({ \
+ LTTNG_ASSERT((optional).is_set); \
+ (optional).value; \
})
/*
})
/*
@@
-71,10
+71,10
@@
* an optional value is set to LTTNG_ASSERT() that it is set when fecthing the
* underlying value's address.
*/
* an optional value is set to LTTNG_ASSERT() that it is set when fecthing the
* underlying value's address.
*/
-#define LTTNG_OPTIONAL_GET_PTR(optional)
\
- ({
\
- LTTNG_ASSERT((optional).is_set);
\
- &(optional).value;
\
+#define LTTNG_OPTIONAL_GET_PTR(optional) \
+ ({ \
+ LTTNG_ASSERT((optional).is_set); \
+ &(optional).value; \
})
/*
})
/*
@@
-83,7
+83,9
@@
* The wrapped field is set to the value it would gave if it had static storage
* duration.
*/
* The wrapped field is set to the value it would gave if it had static storage
* duration.
*/
-#define LTTNG_OPTIONAL_INIT_UNSET {}
+#define LTTNG_OPTIONAL_INIT_UNSET \
+ { \
+ }
/*
* Initialize an optional field as 'set' with a given value.
/*
* Initialize an optional field as 'set' with a given value.
@@
-94,16
+96,16
@@
}
/* Set the value of an optional field. */
}
/* Set the value of an optional field. */
-#define LTTNG_OPTIONAL_SET(field_ptr, val)
\
- do {
\
- (field_ptr)->is_set = 1;
\
- (field_ptr)->value = (val);
\
+#define LTTNG_OPTIONAL_SET(field_ptr, val) \
+ do { \
+ (field_ptr)->is_set = 1; \
+ (field_ptr)->value = (val); \
} while (0)
/* Put an optional field in the "unset" (NULL-ed) state. */
} while (0)
/* Put an optional field in the "unset" (NULL-ed) state. */
-#define LTTNG_OPTIONAL_UNSET(field_ptr)
\
- do {
\
- (field_ptr)->is_set = 0;
\
+#define LTTNG_OPTIONAL_UNSET(field_ptr) \
+ do { \
+ (field_ptr)->is_set = 0; \
} while (0)
#endif /* LTTNG_OPTIONAL_H */
} while (0)
#endif /* LTTNG_OPTIONAL_H */
This page took
0.031203 seconds
and
4
git commands to generate.