X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ftrace-ir%2Fclock-class.h;h=639cf90e1ce65437bf620f58d2b3c809b64ad5c1;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=153456ddb018b800061f7109f3e42bdbd12fc1dd;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/src/lib/trace-ir/clock-class.h b/src/lib/trace-ir/clock-class.h
index 153456dd..639cf90e 100644
--- a/src/lib/trace-ir/clock-class.h
+++ b/src/lib/trace-ir/clock-class.h
@@ -29,7 +29,7 @@
 #include "common/macros.h"
 #include "common/common.h"
 #include "lib/object-pool.h"
-#include "compat/uuid.h"
+#include "common/uuid.h"
 #include <babeltrace2/types.h>
 #include "lib/property.h"
 #include "common/assert.h"
@@ -42,6 +42,9 @@
 struct bt_clock_class {
 	struct bt_object base;
 
+	/* Owned by this */
+	struct bt_value *user_attributes;
+
 	struct {
 		GString *str;
 
@@ -62,7 +65,7 @@ struct bt_clock_class {
 	uint64_t offset_cycles;
 
 	struct {
-		uint8_t uuid[BABELTRACE_UUID_LEN];
+		bt_uuid_t uuid;
 
 		/* NULL or `uuid` above */
 		bt_uuid value;
@@ -111,11 +114,10 @@ int bt_clock_class_clock_value_from_ns_from_origin(
 		struct bt_clock_class *cc, int64_t ns_from_origin,
 		uint64_t *raw_value)
 {
-	BT_ASSERT(cc);
-
+	BT_ASSERT_DBG(cc);
 	return bt_common_clock_value_from_ns_from_origin(cc->offset_seconds,
 		cc->offset_cycles, cc->frequency, ns_from_origin,
-		raw_value) ? BT_FUNC_STATUS_OVERFLOW : BT_FUNC_STATUS_OK;
+		raw_value) ? BT_FUNC_STATUS_OVERFLOW_ERROR : BT_FUNC_STATUS_OK;
 }
 
 #endif /* BABELTRACE_TRACE_IR_CLOCK_CLASS_INTERNAL_H */