X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-test%2Fsucceed%2Fctf-test.txt;h=932db5c9844c3051d6631875540ca65f1c1e975a;hp=c148a436964ea350a926c564e1096f6a2b294789;hb=0fbb34a5699c1dcb43d8e2b870390e7041465466;hpb=a030d0842e2f7f6d88fbcd496d9e9287a8d5b78e diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt index c148a436..932db5c9 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt @@ -3,7 +3,7 @@ typealias integer { size = 32; align = 32; signed = true; } := int; typealias integer { size = 64; align = 64; signed = true; } := long; typealias integer { size = 64; align = 64; } := unsigned long; -enum name1 { +enum name1 : int { ZERO, ONE, TWO, @@ -11,18 +11,18 @@ enum name1 { ELEVEN, }; -enum name2 { ONE, TWO }; +enum name2 : long { ONE, TWO }; -enum name3 { ONE, TWO }; +enum name3 : unsigned long { ONE, TWO }; -enum name4 { +enum name4 : unsigned long { string = 1 ... 2, "other string" = 3...4, yet_another_string, /* will be assigned to end_value2 + 1 */ "some other string" = 10, }; -enum name5 { "int" = 1, }; +enum name5 : long { "int" = 1, }; typealias floating_point { exp_dig = 8; /* sizeof(float) * CHAR_BIT - FLT_MANT_DIG */ @@ -69,7 +69,7 @@ struct name { typealias integer { size = 16; align = 16; signed = true; } := short; typealias uint32_t := unsigned int; - enum { a, b, c, d } choice; + enum : uint2_t { a, b, c, d } choice; /* Unrelated fields can be added between the variant and its tag */ int32_t somevalue; variant { @@ -130,7 +130,7 @@ struct event_header_1 { * id: range: 0 - 30. * id 31 is reserved to indicate an extended header. */ - enum { compact = 0 ... 30, extended = 31 } id; + enum : uint5_t { compact = 0 ... 30, extended = 31 } id; variant { struct { uint27_t timestamp; @@ -151,7 +151,7 @@ struct event_header_2 { * id: range: 0 - 65534. * id 65535 is reserved to indicate an extended header. */ - enum { compact = 0 ... 65534, extended = 65535 } id; + enum : uint16_t { compact = 0 ... 65534, extended = 65535 } id; variant { struct { uint32_t timestamp;