X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Foptional.hpp;h=69bba5be54254041b89e8f3f0213ac4e4d18ad9a;hb=7a96a40be44ee53ee525b80d0eaf4233a07a56a5;hp=4bb774739a8aa870c03aa328040690e9a725e3a8;hpb=5c7248cd5bce45bf64d563fb4e130a63bf345f11;p=lttng-tools.git diff --git a/src/common/optional.hpp b/src/common/optional.hpp index 4bb774739..69bba5be5 100644 --- a/src/common/optional.hpp +++ b/src/common/optional.hpp @@ -37,10 +37,10 @@ * * LTTNG_OPTIONAL_UNSET(&foo.b); */ -#define LTTNG_OPTIONAL(type) \ - struct { \ +#define LTTNG_OPTIONAL(type) \ + struct { \ 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. */ -#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. */ -#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. */ -#define LTTNG_OPTIONAL_INIT_UNSET {} +#define LTTNG_OPTIONAL_INIT_UNSET \ + { \ + } /* * Initialize an optional field as 'set' with a given value. @@ -94,16 +96,16 @@ } /* 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. */ -#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 */