From ac19444e607847c47917c1cc1abfa09311e19e25 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Sat, 4 Nov 2023 16:04:46 -0400 Subject: [PATCH] cpp-common/bt2: remove useless `_ThisXyz` type aliases Name is injected so those private `_ThisXyz` type aliases are useless. Signed-off-by: Philippe Proulx Change-Id: I4313729f63f4fe74622517d19dd986bd3393766b Reviewed-on: https://review.lttng.org/c/babeltrace/+/11239 Reviewed-by: Simon Marchi --- src/cpp-common/bt2/clock-class.hpp | 6 ++--- src/cpp-common/bt2/field-class.hpp | 18 ++++--------- src/cpp-common/bt2/integer-range-set.hpp | 8 +++--- src/cpp-common/bt2/integer-range.hpp | 9 +++---- src/cpp-common/bt2/trace-ir.hpp | 33 +++++++++--------------- 5 files changed, 26 insertions(+), 48 deletions(-) diff --git a/src/cpp-common/bt2/clock-class.hpp b/src/cpp-common/bt2/clock-class.hpp index 48ff132e..35ddfbfa 100644 --- a/src/cpp-common/bt2/clock-class.hpp +++ b/src/cpp-common/bt2/clock-class.hpp @@ -96,11 +96,9 @@ class CommonClockClass final : public BorrowedObject private: using typename BorrowedObject::_ThisBorrowedObject; using typename BorrowedObject::_LibObjPtr; - using _ThisCommonClockClass = CommonClockClass; public: - using Shared = SharedObject<_ThisCommonClockClass, LibObjT, internal::ClockClassRefFuncs>; - + using Shared = SharedObject; using UserAttributes = internal::DepUserAttrs; explicit CommonClockClass(const _LibObjPtr libObjPtr) noexcept : _ThisBorrowedObject {libObjPtr} @@ -114,7 +112,7 @@ public: } template - _ThisCommonClockClass& operator=(const CommonClockClass clkClass) noexcept + CommonClockClass& operator=(const CommonClockClass clkClass) noexcept { _ThisBorrowedObject::operator=(clkClass); return *this; diff --git a/src/cpp-common/bt2/field-class.hpp b/src/cpp-common/bt2/field-class.hpp index 5ce29b70..95d3f8b2 100644 --- a/src/cpp-common/bt2/field-class.hpp +++ b/src/cpp-common/bt2/field-class.hpp @@ -822,10 +822,9 @@ class CommonEnumerationFieldClass final : public CommonBaseEnumerationFieldClass private: using typename CommonFieldClass::_LibObjPtr; using typename CommonBaseEnumerationFieldClass::_ThisCommonBaseEnumerationFieldClass; - using _ThisCommonEnumerationFieldClass = CommonEnumerationFieldClass; public: - using Shared = SharedFieldClass<_ThisCommonEnumerationFieldClass, LibObjT>; + using Shared = SharedFieldClass; using Iterator = BorrowedObjectIterator; using Mapping = MappingT; @@ -838,7 +837,7 @@ public: template CommonEnumerationFieldClass( const CommonEnumerationFieldClass fc) noexcept : - _ThisCommonEnumerationFieldClass {fc} + CommonEnumerationFieldClass {fc} { } @@ -846,7 +845,7 @@ public: CommonEnumerationFieldClass& operator=(const CommonEnumerationFieldClass fc) noexcept { - _ThisCommonEnumerationFieldClass::operator=(fc); + CommonEnumerationFieldClass::operator=(fc); return *this; } @@ -1765,12 +1764,8 @@ private: using typename CommonOptionWithSelectorFieldClass< LibObjT>::_ThisCommonOptionWithSelectorFieldClass; - using _ThisCommonOptionWithIntegerSelectorFieldClass = - CommonOptionWithIntegerSelectorFieldClass; - public: - using Shared = SharedFieldClass<_ThisCommonOptionWithIntegerSelectorFieldClass, LibObjT>; - + using Shared = SharedFieldClass; using RangeSet = RangeSetT; explicit CommonOptionWithIntegerSelectorFieldClass(const _LibObjPtr libObjPtr) noexcept : @@ -2462,14 +2457,11 @@ private: using typename CommonVariantWithSelectorFieldClass< LibObjT>::_ThisCommonVariantWithSelectorFieldClass; using typename CommonFieldClass::_LibObjPtr; - using _ThisCommonVariantWithIntegerSelectorFieldClass = - CommonVariantWithIntegerSelectorFieldClass; using _Spec = internal::CommonVariantWithIntegerSelectorFieldClassSpec; public: - using Shared = SharedFieldClass<_ThisCommonVariantWithIntegerSelectorFieldClass, LibObjT>; - + using Shared = SharedFieldClass; using Option = OptionT; using Iterator = diff --git a/src/cpp-common/bt2/integer-range-set.hpp b/src/cpp-common/bt2/integer-range-set.hpp index b42a28c4..07de9431 100644 --- a/src/cpp-common/bt2/integer-range-set.hpp +++ b/src/cpp-common/bt2/integer-range-set.hpp @@ -138,12 +138,11 @@ private: using typename BorrowedObject::_ThisBorrowedObject; using typename BorrowedObject::_LibObjPtr; using _ConstLibObjT = typename std::add_const::type; - using _RefFuncs = internal::IntegerRangeSetRefFuncs<_ConstLibObjT>; using _Spec = internal::CommonIntegerRangeSetSpec<_ConstLibObjT>; - using _ThisCommonIntegerRangeSet = CommonIntegerRangeSet; public: - using Shared = SharedObject<_ThisCommonIntegerRangeSet, LibObjT, _RefFuncs>; + using Shared = SharedObject>; using Range = typename std::conditional< std::is_same<_ConstLibObjT, const bt_integer_range_set_unsigned>::value, @@ -172,8 +171,7 @@ public: } template - _ThisCommonIntegerRangeSet& - operator=(const CommonIntegerRangeSet rangeSet) noexcept + CommonIntegerRangeSet& operator=(const CommonIntegerRangeSet rangeSet) noexcept { _ThisBorrowedObject::operator=(rangeSet); return *this; diff --git a/src/cpp-common/bt2/integer-range.hpp b/src/cpp-common/bt2/integer-range.hpp index 35e62a08..aafc22e5 100644 --- a/src/cpp-common/bt2/integer-range.hpp +++ b/src/cpp-common/bt2/integer-range.hpp @@ -70,7 +70,6 @@ class ConstIntegerRange final : public BorrowedObject private: using typename BorrowedObject::_ThisBorrowedObject; using typename BorrowedObject::_LibObjPtr; - using _ThisConstIntegerRange = ConstIntegerRange; public: using Value = @@ -83,23 +82,23 @@ public: { } - ConstIntegerRange(const _ThisConstIntegerRange& range) noexcept : _ThisBorrowedObject {range} + ConstIntegerRange(const ConstIntegerRange& range) noexcept : _ThisBorrowedObject {range} { } - _ThisConstIntegerRange& operator=(const _ThisConstIntegerRange& range) noexcept + ConstIntegerRange& operator=(const ConstIntegerRange& range) noexcept { _ThisBorrowedObject::operator=(range); return *this; } - bool operator==(const _ThisConstIntegerRange& other) const noexcept + bool operator==(const ConstIntegerRange& other) const noexcept { return internal::ConstIntegerRangeSpec::isEqual(this->libObjPtr(), other.libObjPtr()); } - bool operator!=(const _ThisConstIntegerRange& other) const noexcept + bool operator!=(const ConstIntegerRange& other) const noexcept { return !(*this == other); } diff --git a/src/cpp-common/bt2/trace-ir.hpp b/src/cpp-common/bt2/trace-ir.hpp index 245a9d4f..b5557d7d 100644 --- a/src/cpp-common/bt2/trace-ir.hpp +++ b/src/cpp-common/bt2/trace-ir.hpp @@ -276,12 +276,11 @@ private: using typename BorrowedObject::_ThisBorrowedObject; using typename BorrowedObject::_LibObjPtr; using _Spec = internal::CommonPacketSpec; - using _ThisCommonPacket = CommonPacket; using _Stream = internal::DepStream; using _StructureField = internal::DepStructField; public: - using Shared = SharedObject<_ThisCommonPacket, LibObjT, internal::PacketRefFuncs>; + using Shared = SharedObject; explicit CommonPacket(const _LibObjPtr libObjPtr) noexcept : _ThisBorrowedObject {libObjPtr} { @@ -293,7 +292,7 @@ public: } template - _ThisCommonPacket& operator=(const CommonPacket packet) noexcept + CommonPacket& operator=(const CommonPacket packet) noexcept { _ThisBorrowedObject::operator=(packet); return *this; @@ -426,11 +425,10 @@ private: using typename BorrowedObject::_ThisBorrowedObject; using typename BorrowedObject::_LibObjPtr; using _Spec = internal::CommonStreamSpec; - using _ThisCommonStream = CommonStream; using _Trace = internal::DepType, CommonTrace>; public: - using Shared = SharedObject<_ThisCommonStream, LibObjT, internal::StreamRefFuncs>; + using Shared = SharedObject; using UserAttributes = internal::DepUserAttrs; using Class = internal::DepType, @@ -446,7 +444,7 @@ public: } template - _ThisCommonStream& operator=(const CommonStream stream) noexcept + CommonStream& operator=(const CommonStream stream) noexcept { _ThisBorrowedObject::operator=(stream); return *this; @@ -635,11 +633,10 @@ private: using typename BorrowedObject::_ThisBorrowedObject; using typename BorrowedObject::_LibObjPtr; using _Spec = internal::CommonTraceSpec; - using _ThisCommonTrace = CommonTrace; using _Stream = internal::DepStream; public: - using Shared = SharedObject<_ThisCommonTrace, LibObjT, internal::TraceRefFuncs>; + using Shared = SharedObject; using UserAttributes = internal::DepUserAttrs; using Class = internal::DepType, @@ -661,7 +658,7 @@ public: } template - _ThisCommonTrace& operator=(const CommonTrace trace) noexcept + CommonTrace& operator=(const CommonTrace trace) noexcept { _ThisBorrowedObject::operator=(trace); return *this; @@ -941,15 +938,13 @@ private: using typename BorrowedObject::_ThisBorrowedObject; using typename BorrowedObject::_LibObjPtr; using _Spec = internal::CommonEventClassSpec; - using _ThisCommonEventClass = CommonEventClass; using _StructureFieldClass = internal::DepStructFc; using _StreamClass = internal::DepType, CommonStreamClass>; public: - using Shared = SharedObject<_ThisCommonEventClass, LibObjT, internal::EventClassRefFuncs>; - + using Shared = SharedObject; using UserAttributes = internal::DepUserAttrs; enum class LogLevel @@ -982,7 +977,7 @@ public: } template - _ThisCommonEventClass& operator=(const CommonEventClass eventClass) noexcept + CommonEventClass& operator=(const CommonEventClass eventClass) noexcept { _ThisBorrowedObject::operator=(eventClass); return *this; @@ -1281,7 +1276,6 @@ private: using typename BorrowedObject::_ThisBorrowedObject; using typename BorrowedObject::_LibObjPtr; using _Spec = internal::CommonStreamClassSpec; - using _ThisCommonStreamClass = CommonStreamClass; using _StructureFieldClass = internal::DepStructFc; using _TraceClass = internal::DepType, @@ -1293,8 +1287,7 @@ private: using _ClockClass = internal::DepType; public: - using Shared = SharedObject<_ThisCommonStreamClass, LibObjT, internal::StreamClassRefFuncs>; - + using Shared = SharedObject; using UserAttributes = internal::DepUserAttrs; explicit CommonStreamClass(const _LibObjPtr libObjPtr) noexcept : @@ -1309,7 +1302,7 @@ public: } template - _ThisCommonStreamClass& operator=(const CommonStreamClass streamClass) noexcept + CommonStreamClass& operator=(const CommonStreamClass streamClass) noexcept { _ThisBorrowedObject::operator=(streamClass); return *this; @@ -1719,14 +1712,12 @@ private: using typename BorrowedObject::_ThisBorrowedObject; using typename BorrowedObject::_LibObjPtr; using _Spec = internal::CommonTraceClassSpec; - using _ThisCommonTraceClass = CommonTraceClass; using _StreamClass = internal::DepType, CommonStreamClass>; public: - using Shared = SharedObject<_ThisCommonTraceClass, LibObjT, internal::TraceClassRefFuncs>; - + using Shared = SharedObject; using UserAttributes = internal::DepUserAttrs; explicit CommonTraceClass(const _LibObjPtr libObjPtr) noexcept : _ThisBorrowedObject {libObjPtr} @@ -1740,7 +1731,7 @@ public: } template - _ThisCommonTraceClass& operator=(const CommonTraceClass traceClass) noexcept + CommonTraceClass& operator=(const CommonTraceClass traceClass) noexcept { _ThisBorrowedObject::operator=(traceClass); return *this; -- 2.34.1