X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcpp-common%2Fbt2%2Ffield-class.hpp;h=83cd52157cc4af723e6bc895817a52204e193cee;hb=1c5ea5eb3a9adbc3adc4a3a36a6cf09f7fa05bf1;hp=411cf6690a1798355b2bcc2341a5621f203acc01;hpb=eee15e593cc1c99b61d5d7089aea2f47e820b461;p=babeltrace.git

diff --git a/src/cpp-common/bt2/field-class.hpp b/src/cpp-common/bt2/field-class.hpp
index 411cf669..83cd5215 100644
--- a/src/cpp-common/bt2/field-class.hpp
+++ b/src/cpp-common/bt2/field-class.hpp
@@ -135,29 +135,28 @@ class CommonTraceClass;
 
 enum class FieldClassType
 {
-    BOOL = BT_FIELD_CLASS_TYPE_BOOL,
-    BIT_ARRAY = BT_FIELD_CLASS_TYPE_BIT_ARRAY,
-    UNSIGNED_INTEGER = BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER,
-    SIGNED_INTEGER = BT_FIELD_CLASS_TYPE_SIGNED_INTEGER,
-    UNSIGNED_ENUMERATION = BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
-    SIGNED_ENUMERATION = BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
-    SINGLE_PRECISION_REAL = BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL,
-    DOUBLE_PRECISION_REAL = BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL,
-    STRING = BT_FIELD_CLASS_TYPE_STRING,
-    STRUCTURE = BT_FIELD_CLASS_TYPE_STRUCTURE,
-    STATIC_ARRAY = BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
-    DYNAMIC_ARRAY_WITHOUT_LENGTH = BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD,
-    DYNAMIC_ARRAY_WITH_LENGTH = BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD,
-    OPTION_WITHOUT_SELECTOR = BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD,
-    OPTION_WITH_BOOL_SELECTOR = BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD,
-    OPTION_WITH_UNSIGNED_INTEGER_SELECTOR =
+    Bool = BT_FIELD_CLASS_TYPE_BOOL,
+    BitArray = BT_FIELD_CLASS_TYPE_BIT_ARRAY,
+    UnsignedInteger = BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER,
+    SignedInteger = BT_FIELD_CLASS_TYPE_SIGNED_INTEGER,
+    UnsignedEnumeration = BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
+    SignedEnumeration = BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
+    SinglePrecisionReal = BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL,
+    DoublePrecisionReal = BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL,
+    String = BT_FIELD_CLASS_TYPE_STRING,
+    Structure = BT_FIELD_CLASS_TYPE_STRUCTURE,
+    StaticArray = BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
+    DynamicArrayWithoutLength = BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD,
+    DynamicArrayWithLength = BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD,
+    OptionWithoutSelector = BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD,
+    OptionWithBoolSelector = BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD,
+    OptionWithUnsignedIntegerSelector =
         BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD,
-    OPTION_WITH_SIGNED_INTEGER_SELECTOR =
-        BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD,
-    VARIANT_WITHOUT_SELECTOR = BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD,
-    VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR =
+    OptionWithSignedIntegerSelector = BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD,
+    VariantWithoutSelector = BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD,
+    VariantWithUnsignedIntegerSelector =
         BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD,
-    VARIANT_WITH_SIGNED_INTEGER_SELECTOR =
+    VariantWithSignedIntegerSelector =
         BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD,
 };
 
@@ -522,10 +521,10 @@ struct TypeDescr<ConstBitArrayFieldClass> : public BitArrayFieldClassTypeDescr
 
 enum class DisplayBase
 {
-    BINARY = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_BINARY,
-    OCTAL = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL,
-    DECIMAL = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL,
-    HEXADECIMAL = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL,
+    Binary = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_BINARY,
+    Octal = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL,
+    Decimal = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL,
+    Hexadecimal = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL,
 };
 
 template <typename LibObjT>