X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Foptional.h;h=0501904cbc4d1cfa52a926be158afe5219712646;hp=dcb7ca8639fd67ddac916ea84816e24e0b2b2b5e;hb=7966af5763c4aaca39df9bbfa9277ff15715c720;hpb=3a5f70173aa04d11ccb22694d5d31a702cad33ab

diff --git a/src/common/optional.h b/src/common/optional.h
index dcb7ca863..0501904cb 100644
--- a/src/common/optional.h
+++ b/src/common/optional.h
@@ -88,13 +88,13 @@
 /*
  * Initialize an optional field as 'set' with a given value.
  */
-#define LTTNG_OPTIONAL_INIT_VALUE(val) { .value = val, .is_set = 1 }
+#define LTTNG_OPTIONAL_INIT_VALUE(val) { .is_set = 1, .value = val }
 
 /* Set the value of an optional field. */
 #define LTTNG_OPTIONAL_SET(field_ptr, val)	\
 	do {					\
-		(field_ptr)->value = (val);	\
 		(field_ptr)->is_set = 1;	\
+		(field_ptr)->value = (val);	\
 	} while (0)
 
 /* Put an optional field in the "unset" (NULL-ed) state. */