X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ffield.hpp;h=f66fdbe7f440dc3c51a237c58fa75977002d84c6;hb=65cd3c0cfa205aa6f67ff974f561882d5eafdd89;hp=23c67b04ce1ebe705172523624af6b3ff34dcf2d;hpb=efc2642c22639e9af4bd01953bfd4453f6218f61;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/field.hpp b/src/bin/lttng-sessiond/field.hpp
index 23c67b04c..f66fdbe7f 100644
--- a/src/bin/lttng-sessiond/field.hpp
+++ b/src/bin/lttng-sessiond/field.hpp
@@ -86,8 +86,13 @@ public:
 
 	const enum byte_order byte_order;
 	const unsigned int size;
-	const signedness signedness;
-	const base base;
+	/*
+	 * signedness and base are suffixed with '_' to work-around a bug in older
+	 * GCCs (before 6) that do not recognize hidden/shadowed enumeration as valid
+	 * nested-name-specifiers.
+	 */
+	const signedness signedness_;
+	const base base_;
 
 protected:
 	virtual bool _is_equal(const type& other) const noexcept override;
@@ -264,7 +269,12 @@ public:
 
 	string_type(unsigned int alignment, enum encoding encoding);
 
-	const encoding encoding;
+	/*
+	 * encoding is suffixed with '_' to work-around a bug in older
+	 * GCCs (before 6) that do not recognize hidden/shadowed enumeration as valid
+	 * nested-name-specifiers.
+	 */
+	const encoding encoding_;
 
 protected:
 	virtual bool _is_equal(const type& base_other) const noexcept override;