From b5f55e9f83cf782b3d423912cfffece103177fe1 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 1 Mar 2022 11:25:05 -0500 Subject: [PATCH] src/cpp-common: use C-style comments in C++ files Signed-off-by: Philippe Proulx Change-Id: I63b73d110e59f39afc59e83fcf7b59e61db78dbc Reviewed-on: https://review.lttng.org/c/babeltrace/+/7434 Reviewed-on: https://review.lttng.org/c/babeltrace/+/10754 Tested-by: jenkins --- src/cpp-common/bt2/clock-class.hpp | 10 +-- src/cpp-common/bt2/clock-snapshot.hpp | 4 +- src/cpp-common/bt2/field-class.hpp | 84 ++++++++++---------- src/cpp-common/bt2/field-path.hpp | 6 +- src/cpp-common/bt2/field.hpp | 34 ++++---- src/cpp-common/bt2/integer-range-set.hpp | 16 ++-- src/cpp-common/bt2/integer-range.hpp | 10 +-- src/cpp-common/bt2/internal/borrowed-obj.hpp | 12 +-- src/cpp-common/bt2/internal/shared-obj.hpp | 20 ++--- src/cpp-common/bt2/internal/utils.hpp | 6 +- src/cpp-common/bt2/lib-error.hpp | 4 +- src/cpp-common/bt2/logging.hpp | 4 +- src/cpp-common/bt2/message.hpp | 48 +++++------ src/cpp-common/bt2/trace-ir.hpp | 48 +++++------ src/cpp-common/bt2/value.hpp | 26 +++--- src/cpp-common/uuid-view.hpp | 4 +- 16 files changed, 168 insertions(+), 168 deletions(-) diff --git a/src/cpp-common/bt2/clock-class.hpp b/src/cpp-common/bt2/clock-class.hpp index e5522096..c312bdbf 100644 --- a/src/cpp-common/bt2/clock-class.hpp +++ b/src/cpp-common/bt2/clock-class.hpp @@ -40,7 +40,7 @@ struct ClockClassRefFuncs final template struct CommonClockClassSpec; -// Functions specific to mutable clock classes +/* Functions specific to mutable clock classes */ template <> struct CommonClockClassSpec final { @@ -50,7 +50,7 @@ struct CommonClockClassSpec final } }; -// Functions specific to constant clock classes +/* Functions specific to constant clock classes */ template <> struct CommonClockClassSpec final { @@ -60,7 +60,7 @@ struct CommonClockClassSpec final } }; -} // namespace internal +} /* namespace internal */ class ClockClassOffset final { @@ -285,6 +285,6 @@ public: using ClockClass = CommonClockClass; using ConstClockClass = CommonClockClass; -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_CLOCK_CLASS_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_CLOCK_CLASS_HPP */ diff --git a/src/cpp-common/bt2/clock-snapshot.hpp b/src/cpp-common/bt2/clock-snapshot.hpp index 26ec9e83..301931f6 100644 --- a/src/cpp-common/bt2/clock-snapshot.hpp +++ b/src/cpp-common/bt2/clock-snapshot.hpp @@ -56,6 +56,6 @@ public: } }; -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_CLOCK_SNAPSHOT_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_CLOCK_SNAPSHOT_HPP */ diff --git a/src/cpp-common/bt2/field-class.hpp b/src/cpp-common/bt2/field-class.hpp index 787a8cb3..a248d9d1 100644 --- a/src/cpp-common/bt2/field-class.hpp +++ b/src/cpp-common/bt2/field-class.hpp @@ -43,7 +43,7 @@ using SharedFieldClass = internal::SharedObj struct CommonFieldClassSpec; -// Functions specific to mutable field classes +/* Functions specific to mutable field classes */ template <> struct CommonFieldClassSpec final { @@ -53,7 +53,7 @@ struct CommonFieldClassSpec final } }; -// Functions specific to constant field classes +/* Functions specific to constant field classes */ template <> struct CommonFieldClassSpec final { @@ -63,7 +63,7 @@ struct CommonFieldClassSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonBitArrayFieldClass; @@ -153,10 +153,10 @@ enum class FieldClassType template class CommonFieldClass : public internal::BorrowedObj { - // Allow appendMember() to call `fc._libObjPtr()` + /* Allow appendMember() to call `fc._libObjPtr()` */ friend class CommonStructureFieldClass; - // Allow appendOption() to call `fc._libObjPtr()` + /* Allow appendOption() to call `fc._libObjPtr()` */ friend class CommonVariantWithoutSelectorFieldClass; friend class CommonVariantWithIntegerSelectorFieldClass< @@ -169,11 +169,11 @@ class CommonFieldClass : public internal::BorrowedObj ConstVariantWithIntegerSelectorFieldClassOption< const bt_field_class_variant_with_selector_field_integer_signed_option>>; - // Allow *FieldClass() to call `fc._libObjPtr()` + /* Allow *FieldClass() to call `fc._libObjPtr()` */ friend class CommonEventClass; friend class CommonStreamClass; - // Allow create*FieldClass() to call `fc._libObjPtr()` + /* Allow create*FieldClass() to call `fc._libObjPtr()` */ friend class CommonTraceClass; private: @@ -558,7 +558,7 @@ namespace internal { template struct ConstEnumerationFieldClassMappingSpec; -// Functions specific to unsigned enumeration field class mappings +/* Functions specific to unsigned enumeration field class mappings */ template <> struct ConstEnumerationFieldClassMappingSpec final @@ -577,7 +577,7 @@ struct ConstEnumerationFieldClassMappingSpec struct ConstEnumerationFieldClassMappingSpec final { @@ -595,7 +595,7 @@ struct ConstEnumerationFieldClassMappingSpec class ConstEnumerationFieldClassMapping final : public internal::BorrowedObj @@ -651,7 +651,7 @@ namespace internal { template struct CommonEnumerationFieldClassSpec; -// Functions specific to unsigned enumeration field classes +/* Functions specific to unsigned enumeration field classes */ template <> struct CommonEnumerationFieldClassSpec final { @@ -668,7 +668,7 @@ struct CommonEnumerationFieldClassSpec struct CommonEnumerationFieldClassSpec final { @@ -685,7 +685,7 @@ struct CommonEnumerationFieldClassSpec } }; -} // namespace internal +} /* namespace internal */ template class CommonEnumerationFieldClass final : public CommonIntegerFieldClass @@ -771,7 +771,7 @@ namespace internal { template struct CommonStructureFieldClassMemberSpec; -// Functions specific to mutable structure field class members +/* Functions specific to mutable structure field class members */ template <> struct CommonStructureFieldClassMemberSpec final { @@ -781,7 +781,7 @@ struct CommonStructureFieldClassMemberSpec fina } }; -// Functions specific to constant structure field class members +/* Functions specific to constant structure field class members */ template <> struct CommonStructureFieldClassMemberSpec final { @@ -792,7 +792,7 @@ struct CommonStructureFieldClassMemberSpec class CommonStructureFieldClassMember final : public internal::BorrowedObj @@ -853,7 +853,7 @@ namespace internal { template struct CommonStructureFieldClassSpec; -// Functions specific to mutable structure field classes +/* Functions specific to mutable structure field classes */ template <> struct CommonStructureFieldClassSpec final { @@ -870,7 +870,7 @@ struct CommonStructureFieldClassSpec final } }; -// Functions specific to constant structure field classes +/* Functions specific to constant structure field classes */ template <> struct CommonStructureFieldClassSpec final { @@ -887,7 +887,7 @@ struct CommonStructureFieldClassSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonStructureFieldClass final : public CommonFieldClass @@ -1009,7 +1009,7 @@ namespace internal { template struct CommonArrayFieldClassSpec; -// Functions specific to mutable array field classes +/* Functions specific to mutable array field classes */ template <> struct CommonArrayFieldClassSpec final { @@ -1019,7 +1019,7 @@ struct CommonArrayFieldClassSpec final } }; -// Functions specific to constant array field classes +/* Functions specific to constant array field classes */ template <> struct CommonArrayFieldClassSpec final { @@ -1029,7 +1029,7 @@ struct CommonArrayFieldClassSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonArrayFieldClass : public CommonFieldClass @@ -1187,7 +1187,7 @@ namespace internal { template struct CommonOptionFieldClassSpec; -// Functions specific to mutable option field classes +/* Functions specific to mutable option field classes */ template <> struct CommonOptionFieldClassSpec final { @@ -1197,7 +1197,7 @@ struct CommonOptionFieldClassSpec final } }; -// Functions specific to constant option field classes +/* Functions specific to constant option field classes */ template <> struct CommonOptionFieldClassSpec final { @@ -1207,7 +1207,7 @@ struct CommonOptionFieldClassSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonOptionFieldClass : public CommonFieldClass @@ -1372,7 +1372,7 @@ namespace internal { template struct CommonOptionWithIntegerSelectorFieldClassSpec; -// Functions specific to option field classes with unsigned integer ranges +/* Functions specific to option field classes with unsigned integer ranges */ template <> struct CommonOptionWithIntegerSelectorFieldClassSpec final { @@ -1384,7 +1384,7 @@ struct CommonOptionWithIntegerSelectorFieldClassSpec struct CommonOptionWithIntegerSelectorFieldClassSpec final { @@ -1396,7 +1396,7 @@ struct CommonOptionWithIntegerSelectorFieldClassSpec } }; -} // namespace internal +} /* namespace internal */ template class CommonOptionWithIntegerSelectorFieldClass : public CommonOptionWithSelectorFieldClass @@ -1466,7 +1466,7 @@ namespace internal { template struct CommonVariantFieldClassOptionSpec; -// Functions specific to mutable variant field class options +/* Functions specific to mutable variant field class options */ template <> struct CommonVariantFieldClassOptionSpec final { @@ -1476,7 +1476,7 @@ struct CommonVariantFieldClassOptionSpec final } }; -// Functions specific to constant variant field class options +/* Functions specific to constant variant field class options */ template <> struct CommonVariantFieldClassOptionSpec final { @@ -1487,7 +1487,7 @@ struct CommonVariantFieldClassOptionSpec fi } }; -} // namespace internal +} /* namespace internal */ template class CommonVariantFieldClassOption : public internal::BorrowedObj @@ -1547,7 +1547,7 @@ namespace internal { template struct ConstVariantWithIntegerSelectorFieldClassOptionSpec; -// Functions specific to variant field class options with unsigned integer selector +/* Functions specific to variant field class options with unsigned integer selector */ template <> struct ConstVariantWithIntegerSelectorFieldClassOptionSpec< const bt_field_class_variant_with_selector_field_integer_unsigned_option> @@ -1570,7 +1570,7 @@ struct ConstVariantWithIntegerSelectorFieldClassOptionSpec< } }; -// Functions specific to variant field class options with signed integer selector +/* Functions specific to variant field class options with signed integer selector */ template <> struct ConstVariantWithIntegerSelectorFieldClassOptionSpec< const bt_field_class_variant_with_selector_field_integer_signed_option> @@ -1593,7 +1593,7 @@ struct ConstVariantWithIntegerSelectorFieldClassOptionSpec< } }; -} // namespace internal +} /* namespace internal */ template class ConstVariantWithIntegerSelectorFieldClassOption : public internal::BorrowedObj @@ -1664,7 +1664,7 @@ namespace internal { template struct CommonVariantFieldClassSpec; -// Functions specific to mutable variant field classes +/* Functions specific to mutable variant field classes */ template <> struct CommonVariantFieldClassSpec final { @@ -1681,7 +1681,7 @@ struct CommonVariantFieldClassSpec final } }; -// Functions specific to constant variant field classes +/* Functions specific to constant variant field classes */ template <> struct CommonVariantFieldClassSpec final { @@ -1698,7 +1698,7 @@ struct CommonVariantFieldClassSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonVariantFieldClass : public CommonFieldClass @@ -1866,7 +1866,7 @@ namespace internal { template struct CommonVariantWithIntegerSelectorFieldClassSpec; -// Functions specific to variant field classes with unsigned integer selector +/* Functions specific to variant field classes with unsigned integer selector */ template <> struct CommonVariantWithIntegerSelectorFieldClassSpec< ConstVariantWithUnsignedIntegerSelectorFieldClassOption> @@ -1896,7 +1896,7 @@ struct CommonVariantWithIntegerSelectorFieldClassSpec< } }; -// Functions specific to variant field classes with signed integer selector +/* Functions specific to variant field classes with signed integer selector */ template <> struct CommonVariantWithIntegerSelectorFieldClassSpec< ConstVariantWithSignedIntegerSelectorFieldClassOption> @@ -1926,7 +1926,7 @@ struct CommonVariantWithIntegerSelectorFieldClassSpec< } }; -} // namespace internal +} /* namespace internal */ template class CommonVariantWithIntegerSelectorFieldClass : public CommonVariantFieldClass @@ -2170,6 +2170,6 @@ CommonFieldClass::asVariantWithSignedIntegerSelector() const noexcept LibObjT, ConstVariantWithSignedIntegerSelectorFieldClassOption> {this->_libObjPtr()}; } -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_FIELD_CLASS_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_FIELD_CLASS_HPP */ diff --git a/src/cpp-common/bt2/field-path.hpp b/src/cpp-common/bt2/field-path.hpp index b91d9113..8a4d9f22 100644 --- a/src/cpp-common/bt2/field-path.hpp +++ b/src/cpp-common/bt2/field-path.hpp @@ -117,7 +117,7 @@ struct FieldPathRefFuncs final } }; -} // namespace internal +} /* namespace internal */ class ConstFieldPath final : public internal::BorrowedObj { @@ -169,6 +169,6 @@ public: } }; -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_FIELD_PATH_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_FIELD_PATH_HPP */ diff --git a/src/cpp-common/bt2/field.hpp b/src/cpp-common/bt2/field.hpp index c62368e5..54f3b38a 100644 --- a/src/cpp-common/bt2/field.hpp +++ b/src/cpp-common/bt2/field.hpp @@ -66,7 +66,7 @@ namespace internal { template struct CommonFieldSpec; -// Functions specific to mutable fields +/* Functions specific to mutable fields */ template <> struct CommonFieldSpec final { @@ -76,7 +76,7 @@ struct CommonFieldSpec final } }; -// Functions specific to constant fields +/* Functions specific to constant fields */ template <> struct CommonFieldSpec final { @@ -86,7 +86,7 @@ struct CommonFieldSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonField : public internal::BorrowedObj @@ -796,7 +796,7 @@ namespace internal { template struct CommonStructureFieldSpec; -// Functions specific to mutable structure fields +/* Functions specific to mutable structure fields */ template <> struct CommonStructureFieldSpec final { @@ -812,7 +812,7 @@ struct CommonStructureFieldSpec final } }; -// Functions specific to constant structure fields +/* Functions specific to constant structure fields */ template <> struct CommonStructureFieldSpec final { @@ -829,7 +829,7 @@ struct CommonStructureFieldSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonStructureField final : public CommonField @@ -932,7 +932,7 @@ namespace internal { template struct CommonArrayFieldSpec; -// Functions specific to mutable array fields +/* Functions specific to mutable array fields */ template <> struct CommonArrayFieldSpec final { @@ -943,7 +943,7 @@ struct CommonArrayFieldSpec final } }; -// Functions specific to constant array fields +/* Functions specific to constant array fields */ template <> struct CommonArrayFieldSpec final { @@ -954,7 +954,7 @@ struct CommonArrayFieldSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonArrayField : public CommonField @@ -1072,7 +1072,7 @@ namespace internal { template struct CommonOptionFieldSpec; -// Functions specific to mutable option fields +/* Functions specific to mutable option fields */ template <> struct CommonOptionFieldSpec final { @@ -1082,7 +1082,7 @@ struct CommonOptionFieldSpec final } }; -// Functions specific to constant option fields +/* Functions specific to constant option fields */ template <> struct CommonOptionFieldSpec final { @@ -1092,7 +1092,7 @@ struct CommonOptionFieldSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonOptionField : public CommonField @@ -1178,7 +1178,7 @@ namespace internal { template struct CommonVariantFieldSpec; -// Functions specific to mutable variant fields +/* Functions specific to mutable variant fields */ template <> struct CommonVariantFieldSpec final { @@ -1188,7 +1188,7 @@ struct CommonVariantFieldSpec final } }; -// Functions specific to constant variant fields +/* Functions specific to constant variant fields */ template <> struct CommonVariantFieldSpec final { @@ -1198,7 +1198,7 @@ struct CommonVariantFieldSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonVariantField : public CommonField @@ -1366,6 +1366,6 @@ CommonVariantField CommonField::asVariant() const noexcept return CommonVariantField {this->_libObjPtr()}; } -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_FIELD_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_FIELD_HPP */ diff --git a/src/cpp-common/bt2/integer-range-set.hpp b/src/cpp-common/bt2/integer-range-set.hpp index a56a4566..da6b690f 100644 --- a/src/cpp-common/bt2/integer-range-set.hpp +++ b/src/cpp-common/bt2/integer-range-set.hpp @@ -54,7 +54,7 @@ struct IntegerRangeSetRefFuncs final template struct CommonIntegerRangeSetSpec; -// Functions specific to unsigned integer range sets +/* Functions specific to unsigned integer range sets */ template <> struct CommonIntegerRangeSetSpec final { @@ -91,7 +91,7 @@ struct CommonIntegerRangeSetSpec final } }; -// Functions specific to signed integer range sets +/* Functions specific to signed integer range sets */ template <> struct CommonIntegerRangeSetSpec final { @@ -127,7 +127,7 @@ struct CommonIntegerRangeSetSpec final } }; -} // namespace internal +} /* namespace internal */ template class ConstVariantWithIntegerSelectorFieldClassOption; @@ -141,13 +141,13 @@ class CommonTraceClass; template class CommonIntegerRangeSet final : public internal::BorrowedObj { - // Allow operator==() to call `other._libObjPtr()` + /* Allow operator==() to call `other._libObjPtr()` */ friend class CommonIntegerRangeSet; friend class CommonIntegerRangeSet; friend class CommonIntegerRangeSet; friend class CommonIntegerRangeSet; - // Allow appendOption() to call `ranges._libObjPtr()` + /* Allow appendOption() to call `ranges._libObjPtr()` */ friend class CommonVariantWithIntegerSelectorFieldClass< bt_field_class, ConstVariantWithIntegerSelectorFieldClassOption< @@ -158,7 +158,7 @@ class CommonIntegerRangeSet final : public internal::BorrowedObj ConstVariantWithIntegerSelectorFieldClassOption< const bt_field_class_variant_with_selector_field_integer_signed_option>>; - // Allow create*FieldClass() to call `ranges._libObjPtr()` + /* Allow create*FieldClass() to call `ranges._libObjPtr()` */ friend class CommonTraceClass; private: @@ -249,6 +249,6 @@ using ConstUnsignedIntegerRangeSet = CommonIntegerRangeSet; using ConstSignedIntegerRangeSet = CommonIntegerRangeSet; -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_INTEGER_RANGE_SET_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_INTEGER_RANGE_SET_HPP */ diff --git a/src/cpp-common/bt2/integer-range.hpp b/src/cpp-common/bt2/integer-range.hpp index 7e94e9e0..1dff95aa 100644 --- a/src/cpp-common/bt2/integer-range.hpp +++ b/src/cpp-common/bt2/integer-range.hpp @@ -20,7 +20,7 @@ namespace internal { template struct ConstIntegerRangeSpec; -// Functions specific to unsigned integer ranges +/* Functions specific to unsigned integer ranges */ template <> struct ConstIntegerRangeSpec final { @@ -41,7 +41,7 @@ struct ConstIntegerRangeSpec final } }; -// Functions specific to signed integer ranges +/* Functions specific to signed integer ranges */ template <> struct ConstIntegerRangeSpec final { @@ -62,7 +62,7 @@ struct ConstIntegerRangeSpec final } }; -} // namespace internal +} /* namespace internal */ template class ConstIntegerRange final : public internal::BorrowedObj @@ -117,6 +117,6 @@ public: using ConstUnsignedIntegerRange = ConstIntegerRange; using ConstSignedIntegerRange = ConstIntegerRange; -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_INTEGER_RANGE_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_INTEGER_RANGE_HPP */ diff --git a/src/cpp-common/bt2/internal/borrowed-obj.hpp b/src/cpp-common/bt2/internal/borrowed-obj.hpp index 89feb620..4f364598 100644 --- a/src/cpp-common/bt2/internal/borrowed-obj.hpp +++ b/src/cpp-common/bt2/internal/borrowed-obj.hpp @@ -55,10 +55,10 @@ class BorrowedObj friend class SharedObj; protected: - // libbabeltrace2 object pointer + /* libbabeltrace2 object pointer */ using _LibObjPtr = LibObjT *; - // This complete borrowed object + /* This complete borrowed object */ using _ThisBorrowedObj = BorrowedObj; /* @@ -108,7 +108,7 @@ protected: return *this; } - // Wrapped libbabeltrace2 object pointer + /* Wrapped libbabeltrace2 object pointer */ _LibObjPtr _libObjPtr() const noexcept { return _mLibObjPtr; @@ -118,7 +118,7 @@ private: _LibObjPtr _mLibObjPtr; }; -} // namespace internal -} // namespace bt2 +} /* namespace internal */ +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_INTERNAL_BORROWED_OBJ_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_INTERNAL_BORROWED_OBJ_HPP */ diff --git a/src/cpp-common/bt2/internal/shared-obj.hpp b/src/cpp-common/bt2/internal/shared-obj.hpp index 5451be5f..89d1480d 100644 --- a/src/cpp-common/bt2/internal/shared-obj.hpp +++ b/src/cpp-common/bt2/internal/shared-obj.hpp @@ -46,7 +46,7 @@ class SharedObj final friend class SharedObj; public: - // This complete shared object + /* This complete shared object */ using ThisSharedObj = SharedObj; /* @@ -96,7 +96,7 @@ public: template SharedObj(SharedObj&& other) noexcept : _mObj {other._mObj} { - // Reset moved-from object + /* Reset moved-from object */ other._reset(); } @@ -108,10 +108,10 @@ public: template ThisSharedObj& operator=(const SharedObj& other) noexcept { - // Put current object's reference + /* Put current object's reference */ this->_putRef(); - // Set new current object and get a reference + /* Set new current object and get a reference */ _mObj = other._mObj; this->_getRef(); @@ -126,13 +126,13 @@ public: template ThisSharedObj& operator=(SharedObj&& other) noexcept { - // Put current object's reference + /* Put current object's reference */ this->_putRef(); - // Set new current object + /* Set new current object */ _mObj = other._mObj; - // Reset moved-from object + /* Reset moved-from object */ other._reset(); return *this; @@ -203,7 +203,7 @@ private: nonstd::optional _mObj; }; -} // namespace internal -} // namespace bt2 +} /* namespace internal */ +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_INTERNAL_SHARED_OBJ_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_INTERNAL_SHARED_OBJ_HPP */ diff --git a/src/cpp-common/bt2/internal/utils.hpp b/src/cpp-common/bt2/internal/utils.hpp index d429f3bc..cbf761b0 100644 --- a/src/cpp-common/bt2/internal/utils.hpp +++ b/src/cpp-common/bt2/internal/utils.hpp @@ -22,7 +22,7 @@ void validateCreatedObjPtr(const LibObjPtrT libOjbPtr) } } -} // namespace internal -} // namespace bt2 +} /* namespace internal */ +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_INTERNAL_UTILS_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_INTERNAL_UTILS_HPP */ diff --git a/src/cpp-common/bt2/lib-error.hpp b/src/cpp-common/bt2/lib-error.hpp index 646b7fca..be8f8000 100644 --- a/src/cpp-common/bt2/lib-error.hpp +++ b/src/cpp-common/bt2/lib-error.hpp @@ -45,6 +45,6 @@ public: } }; -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_LIB_ERROR_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_LIB_ERROR_HPP */ diff --git a/src/cpp-common/bt2/logging.hpp b/src/cpp-common/bt2/logging.hpp index 471ac477..10e1ee3a 100644 --- a/src/cpp-common/bt2/logging.hpp +++ b/src/cpp-common/bt2/logging.hpp @@ -22,6 +22,6 @@ enum class LoggingLevel NONE = BT_LOGGING_LEVEL_NONE, }; -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_LOGGING_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_LOGGING_HPP */ diff --git a/src/cpp-common/bt2/message.hpp b/src/cpp-common/bt2/message.hpp index 65404f3c..8fd1f1d7 100644 --- a/src/cpp-common/bt2/message.hpp +++ b/src/cpp-common/bt2/message.hpp @@ -41,7 +41,7 @@ struct MessageRefFuncs final template using SharedMessage = internal::SharedObj; -} // namespace internal +} /* namespace internal */ template class CommonStreamBeginningMessage; @@ -176,7 +176,7 @@ namespace internal { template struct CommonStreamBeginningMessageSpec; -// Functions specific to mutable stream beginning messages +/* Functions specific to mutable stream beginning messages */ template <> struct CommonStreamBeginningMessageSpec final { @@ -186,7 +186,7 @@ struct CommonStreamBeginningMessageSpec final } }; -// Functions specific to constant stream beginning messages +/* Functions specific to constant stream beginning messages */ template <> struct CommonStreamBeginningMessageSpec final { @@ -196,7 +196,7 @@ struct CommonStreamBeginningMessageSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonStreamBeginningMessage final : public CommonMessage @@ -278,7 +278,7 @@ namespace internal { template struct CommonStreamEndMessageSpec; -// Functions specific to mutable stream end messages +/* Functions specific to mutable stream end messages */ template <> struct CommonStreamEndMessageSpec final { @@ -288,7 +288,7 @@ struct CommonStreamEndMessageSpec final } }; -// Functions specific to constant stream end messages +/* Functions specific to constant stream end messages */ template <> struct CommonStreamEndMessageSpec final { @@ -298,7 +298,7 @@ struct CommonStreamEndMessageSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonStreamEndMessage final : public CommonMessage @@ -379,7 +379,7 @@ namespace internal { template struct CommonPacketBeginningMessageSpec; -// Functions specific to mutable packet beginning messages +/* Functions specific to mutable packet beginning messages */ template <> struct CommonPacketBeginningMessageSpec final { @@ -389,7 +389,7 @@ struct CommonPacketBeginningMessageSpec final } }; -// Functions specific to constant packet beginning messages +/* Functions specific to constant packet beginning messages */ template <> struct CommonPacketBeginningMessageSpec final { @@ -399,7 +399,7 @@ struct CommonPacketBeginningMessageSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonPacketBeginningMessage final : public CommonMessage @@ -476,7 +476,7 @@ namespace internal { template struct CommonPacketEndMessageSpec; -// Functions specific to mutable packet end messages +/* Functions specific to mutable packet end messages */ template <> struct CommonPacketEndMessageSpec final { @@ -486,7 +486,7 @@ struct CommonPacketEndMessageSpec final } }; -// Functions specific to constant packet end messages +/* Functions specific to constant packet end messages */ template <> struct CommonPacketEndMessageSpec final { @@ -496,7 +496,7 @@ struct CommonPacketEndMessageSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonPacketEndMessage final : public CommonMessage @@ -572,7 +572,7 @@ namespace internal { template struct CommonEventMessageSpec; -// Functions specific to mutable event messages +/* Functions specific to mutable event messages */ template <> struct CommonEventMessageSpec final { @@ -582,7 +582,7 @@ struct CommonEventMessageSpec final } }; -// Functions specific to constant event messages +/* Functions specific to constant event messages */ template <> struct CommonEventMessageSpec final { @@ -592,7 +592,7 @@ struct CommonEventMessageSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonEventMessage final : public CommonMessage @@ -660,7 +660,7 @@ namespace internal { template struct CommonDiscardedEventsMessageSpec; -// Functions specific to mutable discarded events messages +/* Functions specific to mutable discarded events messages */ template <> struct CommonDiscardedEventsMessageSpec final { @@ -670,7 +670,7 @@ struct CommonDiscardedEventsMessageSpec final } }; -// Functions specific to constant discarded events messages +/* Functions specific to constant discarded events messages */ template <> struct CommonDiscardedEventsMessageSpec final { @@ -680,7 +680,7 @@ struct CommonDiscardedEventsMessageSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonDiscardedEventsMessage final : public CommonMessage @@ -778,7 +778,7 @@ namespace internal { template struct CommonDiscardedPacketsMessageSpec; -// Functions specific to mutable discarded packets messages +/* Functions specific to mutable discarded packets messages */ template <> struct CommonDiscardedPacketsMessageSpec final { @@ -788,7 +788,7 @@ struct CommonDiscardedPacketsMessageSpec final } }; -// Functions specific to constant discarded packets messages +/* Functions specific to constant discarded packets messages */ template <> struct CommonDiscardedPacketsMessageSpec final { @@ -798,7 +798,7 @@ struct CommonDiscardedPacketsMessageSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonDiscardedPacketsMessage final : public CommonMessage @@ -991,6 +991,6 @@ CommonMessage::asMessageIteratorInactivity() const noexcept return CommonMessageIteratorInactivityMessage {this->_libObjPtr()}; } -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_MESSAGE_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_MESSAGE_HPP */ diff --git a/src/cpp-common/bt2/trace-ir.hpp b/src/cpp-common/bt2/trace-ir.hpp index 62dc04e6..c22d736c 100644 --- a/src/cpp-common/bt2/trace-ir.hpp +++ b/src/cpp-common/bt2/trace-ir.hpp @@ -49,7 +49,7 @@ namespace internal { template struct CommonEventSpec; -// Functions specific to mutable events +/* Functions specific to mutable events */ template <> struct CommonEventSpec final { @@ -84,7 +84,7 @@ struct CommonEventSpec final } }; -// Functions specific to constant events +/* Functions specific to constant events */ template <> struct CommonEventSpec final { @@ -119,7 +119,7 @@ struct CommonEventSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonEvent final : public internal::BorrowedObj @@ -257,7 +257,7 @@ struct PacketRefFuncs final template struct CommonPacketSpec; -// Functions specific to mutable packets +/* Functions specific to mutable packets */ template <> struct CommonPacketSpec final { @@ -272,7 +272,7 @@ struct CommonPacketSpec final } }; -// Functions specific to constant packets +/* Functions specific to constant packets */ template <> struct CommonPacketSpec final { @@ -287,7 +287,7 @@ struct CommonPacketSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonPacket final : public internal::BorrowedObj @@ -401,7 +401,7 @@ struct StreamRefFuncs final template struct CommonStreamSpec; -// Functions specific to mutable streams +/* Functions specific to mutable streams */ template <> struct CommonStreamSpec final { @@ -421,7 +421,7 @@ struct CommonStreamSpec final } }; -// Functions specific to constant streams +/* Functions specific to constant streams */ template <> struct CommonStreamSpec final { @@ -441,7 +441,7 @@ struct CommonStreamSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonStream final : public internal::BorrowedObj @@ -599,7 +599,7 @@ struct TraceRefFuncs final template struct CommonTraceSpec; -// Functions specific to mutable traces +/* Functions specific to mutable traces */ template <> struct CommonTraceSpec final { @@ -624,7 +624,7 @@ struct CommonTraceSpec final } }; -// Functions specific to constant traces +/* Functions specific to constant traces */ template <> struct CommonTraceSpec final { @@ -651,12 +651,12 @@ struct CommonTraceSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonTrace final : public internal::BorrowedObj { - // Allow instantiate() to call `trace._libObjPtr()` + /* Allow instantiate() to call `trace._libObjPtr()` */ friend class CommonStreamClass; private: @@ -916,7 +916,7 @@ struct EventClassRefFuncs final template struct CommonEventClassSpec; -// Functions specific to mutable event classes +/* Functions specific to mutable event classes */ template <> struct CommonEventClassSpec final { @@ -941,7 +941,7 @@ struct CommonEventClassSpec final } }; -// Functions specific to constant event classes +/* Functions specific to constant event classes */ template <> struct CommonEventClassSpec final { @@ -967,7 +967,7 @@ struct CommonEventClassSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonEventClass final : public internal::BorrowedObj @@ -1237,7 +1237,7 @@ struct StreamClassRefFuncs final template struct CommonStreamClassSpec; -// Functions specific to mutable stream classes +/* Functions specific to mutable stream classes */ template <> struct CommonStreamClassSpec final { @@ -1279,7 +1279,7 @@ struct CommonStreamClassSpec final } }; -// Functions specific to constant stream classes +/* Functions specific to constant stream classes */ template <> struct CommonStreamClassSpec final { @@ -1323,7 +1323,7 @@ struct CommonStreamClassSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonStreamClass final : public internal::BorrowedObj @@ -1752,7 +1752,7 @@ struct TraceClassRefFuncs final template struct CommonTraceClassSpec; -// Functions specific to mutable stream classes +/* Functions specific to mutable stream classes */ template <> struct CommonTraceClassSpec final { @@ -1774,7 +1774,7 @@ struct CommonTraceClassSpec final } }; -// Functions specific to constant stream classes +/* Functions specific to constant stream classes */ template <> struct CommonTraceClassSpec final { @@ -1796,7 +1796,7 @@ struct CommonTraceClassSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonTraceClass final : public internal::BorrowedObj @@ -2202,6 +2202,6 @@ typename CommonTrace::Class CommonTrace::cls() noexcept return Class {_Spec::cls(this->_libObjPtr())}; } -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_TRACE_IR_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_TRACE_IR_HPP */ diff --git a/src/cpp-common/bt2/value.hpp b/src/cpp-common/bt2/value.hpp index feedde27..a1a7d501 100644 --- a/src/cpp-common/bt2/value.hpp +++ b/src/cpp-common/bt2/value.hpp @@ -42,7 +42,7 @@ struct ValueRefFuncs final template using SharedValue = internal::SharedObj; -} // namespace internal +} /* namespace internal */ template class CommonNullValue; @@ -101,13 +101,13 @@ class CommonStream; template class CommonValue : public internal::BorrowedObj { - // Allow append() to call `val._libObjPtr()` + /* Allow append() to call `val._libObjPtr()` */ friend class CommonArrayValue; - // Allow insert() to call `val._libObjPtr()` + /* Allow insert() to call `val._libObjPtr()` */ friend class CommonMapValue; - // Allow userAttributes() to call `val._libObjPtr()` + /* Allow userAttributes() to call `val._libObjPtr()` */ friend class CommonClockClass; friend class CommonFieldClass; friend class CommonTraceClass; @@ -115,7 +115,7 @@ class CommonValue : public internal::BorrowedObj friend class CommonEventClass; friend class CommonStream; - // Allow operator==() to call `other._libObjPtr()` + /* Allow operator==() to call `other._libObjPtr()` */ friend class CommonValue; friend class CommonValue; @@ -600,7 +600,7 @@ namespace internal { template struct CommonArrayValueSpec; -// Functions specific to mutable array values +/* Functions specific to mutable array values */ template <> struct CommonArrayValueSpec final { @@ -610,7 +610,7 @@ struct CommonArrayValueSpec final } }; -// Functions specific to constant array values +/* Functions specific to constant array values */ template <> struct CommonArrayValueSpec final { @@ -621,7 +621,7 @@ struct CommonArrayValueSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonArrayValueIterator @@ -923,7 +923,7 @@ LibStatusT mapValueForEachLibFunc(const char * const key, LibObjT * const libObj template struct CommonMapValueSpec; -// Functions specific to mutable map values +/* Functions specific to mutable map values */ template <> struct CommonMapValueSpec final { @@ -954,7 +954,7 @@ struct CommonMapValueSpec final } }; -// Functions specific to constant map values +/* Functions specific to constant map values */ template <> struct CommonMapValueSpec final { @@ -987,7 +987,7 @@ struct CommonMapValueSpec final } }; -} // namespace internal +} /* namespace internal */ template class CommonMapValue final : public CommonValue @@ -1354,6 +1354,6 @@ inline StringValue::Shared createValue(const std::string& rawVal) return StringValue::create(rawVal); } -} // namespace bt2 +} /* namespace bt2 */ -#endif // BABELTRACE_CPP_COMMON_BT2_VALUE_HPP +#endif /* BABELTRACE_CPP_COMMON_BT2_VALUE_HPP */ diff --git a/src/cpp-common/uuid-view.hpp b/src/cpp-common/uuid-view.hpp index 31b641e6..35b0b062 100644 --- a/src/cpp-common/uuid-view.hpp +++ b/src/cpp-common/uuid-view.hpp @@ -59,6 +59,6 @@ private: const std::uint8_t *_mUuid; }; -} // namespace bt2_common +} /* namespace bt2_common */ -#endif // BABELTRACE_CPP_COMMON_UUID_VIEW_HPP +#endif /* BABELTRACE_CPP_COMMON_UUID_VIEW_HPP */ -- 2.34.1