From 7f5cdaf0da71769252d4ae548c25be5d1ffc49a1 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 13 Nov 2023 14:49:26 -0500 Subject: [PATCH] cpp-common/bt2: rename `bt2::SharedObj` -> `bt2::SharedObject` This is public now, so use the full name without abbreviation like everything else does. Signed-off-by: Philippe Proulx Change-Id: I1328a9c195061558ca442aed6e177ca43836b99c Reviewed-on: https://review.lttng.org/c/babeltrace/+/11368 Reviewed-by: Simon Marchi --- src/Makefile.am | 2 +- src/cpp-common/bt2/clock-class.hpp | 4 +- src/cpp-common/bt2/field-class.hpp | 4 +- src/cpp-common/bt2/field-path.hpp | 4 +- src/cpp-common/bt2/integer-range-set.hpp | 4 +- src/cpp-common/bt2/message.hpp | 4 +- .../bt2/{shared-obj.hpp => shared-object.hpp} | 74 +++++++++---------- src/cpp-common/bt2/trace-ir.hpp | 14 ++-- src/cpp-common/bt2/value.hpp | 4 +- 9 files changed, 57 insertions(+), 57 deletions(-) rename src/cpp-common/bt2/{shared-obj.hpp => shared-object.hpp} (71%) diff --git a/src/Makefile.am b/src/Makefile.am index 2154e5ac..1f90d14b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ noinst_HEADERS = \ cpp-common/bt2/internal/utils.hpp \ cpp-common/bt2/logging.hpp \ cpp-common/bt2/message.hpp \ - cpp-common/bt2/shared-obj.hpp \ + cpp-common/bt2/shared-object.hpp \ cpp-common/bt2/trace-ir.hpp \ cpp-common/bt2/type-traits.hpp \ cpp-common/bt2/value.hpp \ diff --git a/src/cpp-common/bt2/clock-class.hpp b/src/cpp-common/bt2/clock-class.hpp index 1aac1459..82691b39 100644 --- a/src/cpp-common/bt2/clock-class.hpp +++ b/src/cpp-common/bt2/clock-class.hpp @@ -20,7 +20,7 @@ #include "borrowed-object.hpp" #include "exc.hpp" #include "internal/utils.hpp" -#include "shared-obj.hpp" +#include "shared-object.hpp" #include "value.hpp" namespace bt2 { @@ -100,7 +100,7 @@ private: using _ThisCommonClockClass = CommonClockClass; public: - using Shared = SharedObj<_ThisCommonClockClass, LibObjT, internal::ClockClassRefFuncs>; + using Shared = SharedObject<_ThisCommonClockClass, LibObjT, internal::ClockClassRefFuncs>; using UserAttributes = typename std::conditional::value, ConstMapValue, MapValue>::type; diff --git a/src/cpp-common/bt2/field-class.hpp b/src/cpp-common/bt2/field-class.hpp index f8f3d850..168af69c 100644 --- a/src/cpp-common/bt2/field-class.hpp +++ b/src/cpp-common/bt2/field-class.hpp @@ -22,7 +22,7 @@ #include "field-path.hpp" #include "integer-range-set.hpp" #include "internal/utils.hpp" -#include "shared-obj.hpp" +#include "shared-object.hpp" #include "value.hpp" namespace bt2 { @@ -67,7 +67,7 @@ struct CommonFieldClassSpec final } /* namespace internal */ template -using SharedFieldClass = SharedObj; +using SharedFieldClass = SharedObject; template class CommonBitArrayFieldClass; diff --git a/src/cpp-common/bt2/field-path.hpp b/src/cpp-common/bt2/field-path.hpp index caf1de00..97c1addd 100644 --- a/src/cpp-common/bt2/field-path.hpp +++ b/src/cpp-common/bt2/field-path.hpp @@ -15,7 +15,7 @@ #include "borrowed-object.hpp" #include "common-iter.hpp" -#include "shared-obj.hpp" +#include "shared-object.hpp" namespace bt2 { @@ -127,7 +127,7 @@ struct FieldPathRefFuncs final class ConstFieldPath final : public BorrowedObject { public: - using Shared = SharedObj; + using Shared = SharedObject; using Iterator = CommonIterator; diff --git a/src/cpp-common/bt2/integer-range-set.hpp b/src/cpp-common/bt2/integer-range-set.hpp index 3a05e1d3..6a6a4b4d 100644 --- a/src/cpp-common/bt2/integer-range-set.hpp +++ b/src/cpp-common/bt2/integer-range-set.hpp @@ -17,7 +17,7 @@ #include "exc.hpp" #include "integer-range.hpp" #include "internal/utils.hpp" -#include "shared-obj.hpp" +#include "shared-object.hpp" namespace bt2 { @@ -173,7 +173,7 @@ private: using _ThisCommonIntegerRangeSet = CommonIntegerRangeSet; public: - using Shared = SharedObj<_ThisCommonIntegerRangeSet, LibObjT, _RefFuncs>; + using Shared = SharedObject<_ThisCommonIntegerRangeSet, LibObjT, _RefFuncs>; using Range = typename std::conditional< std::is_same<_ConstLibObjT, const bt_integer_range_set_unsigned>::value, diff --git a/src/cpp-common/bt2/message.hpp b/src/cpp-common/bt2/message.hpp index aee0e7c9..1b49bed5 100644 --- a/src/cpp-common/bt2/message.hpp +++ b/src/cpp-common/bt2/message.hpp @@ -19,7 +19,7 @@ #include "borrowed-object.hpp" #include "internal/utils.hpp" -#include "shared-obj.hpp" +#include "shared-object.hpp" namespace bt2 { namespace internal { @@ -40,7 +40,7 @@ struct MessageRefFuncs final } /* namespace internal */ template -using SharedMessage = SharedObj; +using SharedMessage = SharedObject; template class CommonStreamBeginningMessage; diff --git a/src/cpp-common/bt2/shared-obj.hpp b/src/cpp-common/bt2/shared-object.hpp similarity index 71% rename from src/cpp-common/bt2/shared-obj.hpp rename to src/cpp-common/bt2/shared-object.hpp index d0a2d7f9..1ffbe8b1 100644 --- a/src/cpp-common/bt2/shared-obj.hpp +++ b/src/cpp-common/bt2/shared-object.hpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: MIT */ -#ifndef BABELTRACE_CPP_COMMON_BT2_SHARED_OBJ_HPP -#define BABELTRACE_CPP_COMMON_BT2_SHARED_OBJ_HPP +#ifndef BABELTRACE_CPP_COMMON_BT2_SHARED_OBJECT_HPP +#define BABELTRACE_CPP_COMMON_BT2_SHARED_OBJECT_HPP #include "common/assert.h" #include "cpp-common/optional.hpp" @@ -31,24 +31,24 @@ namespace bt2 { * its reference count. */ template -class SharedObj final +class SharedObject final { /* * This makes it possible for a - * `SharedObj` instance to get + * `SharedObject` instance to get * assigned an instance of - * `SharedObj` (copy/move + * `SharedObject` (copy/move * constructors and assignment operators), given that * `SpecificSomething` inherits `Something`. */ template - friend class SharedObj; + friend class SharedObject; private: /* * Builds a shared object from `obj` without getting a reference. */ - explicit SharedObj(const ObjT& obj) noexcept : _mObj {obj} + explicit SharedObject(const ObjT& obj) noexcept : _mObj {obj} { } @@ -63,7 +63,7 @@ private: * parameters when delegating to a constructor template. */ template - SharedObj(const SharedObj& other, int) noexcept : + SharedObject(const SharedObject& other, int) noexcept : _mObj {other._mObj} { this->_getRef(); @@ -75,7 +75,7 @@ private: * See the comment of the common generic "copy" constructor above. */ template - SharedObj(SharedObj&& other, int) noexcept : + SharedObject(SharedObject&& other, int) noexcept : _mObj {other._mObj} { /* Reset moved-from object */ @@ -86,59 +86,59 @@ public: /* * Builds a shared object from `obj` without getting a reference. */ - static SharedObj createWithoutRef(const ObjT& obj) noexcept + static SharedObject createWithoutRef(const ObjT& obj) noexcept { - return SharedObj {obj}; + return SharedObject {obj}; } /* * Builds a shared object from `libObjPtr` without getting a * reference. */ - static SharedObj createWithoutRef(LibObjT * const libObjPtr) noexcept + static SharedObject createWithoutRef(LibObjT * const libObjPtr) noexcept { - return SharedObj::createWithoutRef(ObjT {libObjPtr}); + return SharedObject::createWithoutRef(ObjT {libObjPtr}); } /* * Builds a shared object from `obj`, immediately getting a new * reference. */ - static SharedObj createWithRef(const ObjT& obj) noexcept + static SharedObject createWithRef(const ObjT& obj) noexcept { - SharedObj sharedObj {obj}; + SharedObject sharedObj {obj}; sharedObj._getRef(); return sharedObj; } /* - * Builds a shared object from `libObjPtr`, immediately getting a new - * reference. + * Builds a shared object from `libObjPtr`, immediately getting a + * new reference. */ - static SharedObj createWithRef(LibObjT * const libObjPtr) noexcept + static SharedObject createWithRef(LibObjT * const libObjPtr) noexcept { - return SharedObj::createWithRef(ObjT {libObjPtr}); + return SharedObject::createWithRef(ObjT {libObjPtr}); } /* * Copy constructor. */ - SharedObj(const SharedObj& other) noexcept : SharedObj {other, 0} + SharedObject(const SharedObject& other) noexcept : SharedObject {other, 0} { } /* * Move constructor. */ - SharedObj(SharedObj&& other) noexcept : SharedObj {std::move(other), 0} + SharedObject(SharedObject&& other) noexcept : SharedObject {std::move(other), 0} { } /* * Copy assignment operator. */ - SharedObj& operator=(const SharedObj& other) noexcept + SharedObject& operator=(const SharedObject& other) noexcept { /* Use generic "copy" assignment operator */ return this->operator=(other); @@ -147,7 +147,7 @@ public: /* * Move assignment operator. */ - SharedObj& operator=(SharedObj&& other) noexcept + SharedObject& operator=(SharedObject&& other) noexcept { /* Use generic "move" assignment operator */ return this->operator=(std::move(other)); @@ -156,32 +156,32 @@ public: /* * Generic "copy" constructor. * - * See the `friend class SharedObj` comment above. + * See the `friend class SharedObject` comment above. */ template - SharedObj(const SharedObj& other) noexcept : - SharedObj {other, 0} + SharedObject(const SharedObject& other) noexcept : + SharedObject {other, 0} { } /* * Generic "move" constructor. * - * See the `friend class SharedObj` comment above. + * See the `friend class SharedObject` comment above. */ template - SharedObj(SharedObj&& other) noexcept : - SharedObj {std::move(other), 0} + SharedObject(SharedObject&& other) noexcept : + SharedObject {std::move(other), 0} { } /* * Generic "copy" assignment operator. * - * See the `friend class SharedObj` comment above. + * See the `friend class SharedObject` comment above. */ template - SharedObj& operator=(const SharedObj& other) noexcept + SharedObject& operator=(const SharedObject& other) noexcept { /* Put current object's reference */ this->_putRef(); @@ -196,10 +196,10 @@ public: /* * Generic "move" assignment operator. * - * See the `friend class SharedObj` comment above. + * See the `friend class SharedObject` comment above. */ template - SharedObj& operator=(SharedObj&& other) noexcept + SharedObject& operator=(SharedObject&& other) noexcept { /* Put current object's reference */ this->_putRef(); @@ -213,7 +213,7 @@ public: return *this; } - ~SharedObj() + ~SharedObject() { this->_putRef(); } @@ -244,8 +244,8 @@ public: /* * Transfers the reference of the object which this shared object - * wrapper manages and returns it, making the caller become an active - * owner. + * wrapper manages and returns it, making the caller become an + * active owner. * * This method makes this object invalid. */ @@ -295,4 +295,4 @@ private: } /* namespace bt2 */ -#endif /* BABELTRACE_CPP_COMMON_BT2_SHARED_OBJ_HPP */ +#endif /* BABELTRACE_CPP_COMMON_BT2_SHARED_OBJECT_HPP */ diff --git a/src/cpp-common/bt2/trace-ir.hpp b/src/cpp-common/bt2/trace-ir.hpp index 293e9954..790735aa 100644 --- a/src/cpp-common/bt2/trace-ir.hpp +++ b/src/cpp-common/bt2/trace-ir.hpp @@ -20,7 +20,7 @@ #include "field-class.hpp" #include "field.hpp" #include "internal/utils.hpp" -#include "shared-obj.hpp" +#include "shared-object.hpp" #include "value.hpp" namespace bt2 { @@ -325,7 +325,7 @@ private: ConstStructureField, StructureField>::type; public: - using Shared = SharedObj<_ThisCommonPacket, LibObjT, internal::PacketRefFuncs>; + using Shared = SharedObject<_ThisCommonPacket, LibObjT, internal::PacketRefFuncs>; explicit CommonPacket(const _LibObjPtr libObjPtr) noexcept : _ThisBorrowedObject {libObjPtr} { @@ -496,7 +496,7 @@ private: CommonTrace>::type; public: - using Shared = SharedObj<_ThisCommonStream, LibObjT, internal::StreamRefFuncs>; + using Shared = SharedObject<_ThisCommonStream, LibObjT, internal::StreamRefFuncs>; using Class = typename std::conditional::value, CommonStreamClass, @@ -729,7 +729,7 @@ private: CommonStream>::type; public: - using Shared = SharedObj<_ThisCommonTrace, LibObjT, internal::TraceRefFuncs>; + using Shared = SharedObject<_ThisCommonTrace, LibObjT, internal::TraceRefFuncs>; using Class = typename std::conditional::value, CommonTraceClass, @@ -1066,7 +1066,7 @@ private: StructureFieldClass>::type; public: - using Shared = SharedObj<_ThisCommonEventClass, LibObjT, internal::EventClassRefFuncs>; + using Shared = SharedObject<_ThisCommonEventClass, LibObjT, internal::EventClassRefFuncs>; using UserAttributes = typename std::conditional::value, ConstMapValue, MapValue>::type; @@ -1448,7 +1448,7 @@ private: typename std::conditional::value, ConstClockClass, ClockClass>::type; public: - using Shared = SharedObj<_ThisCommonStreamClass, LibObjT, internal::StreamClassRefFuncs>; + using Shared = SharedObject<_ThisCommonStreamClass, LibObjT, internal::StreamClassRefFuncs>; using UserAttributes = typename std::conditional::value, ConstMapValue, MapValue>::type; @@ -1930,7 +1930,7 @@ private: CommonStreamClass>::type; public: - using Shared = SharedObj<_ThisCommonTraceClass, LibObjT, internal::TraceClassRefFuncs>; + using Shared = SharedObject<_ThisCommonTraceClass, LibObjT, internal::TraceClassRefFuncs>; using UserAttributes = typename std::conditional::value, ConstMapValue, MapValue>::type; diff --git a/src/cpp-common/bt2/value.hpp b/src/cpp-common/bt2/value.hpp index 19bc357d..7596694c 100644 --- a/src/cpp-common/bt2/value.hpp +++ b/src/cpp-common/bt2/value.hpp @@ -22,7 +22,7 @@ #include "common-iter.hpp" #include "exc.hpp" #include "internal/utils.hpp" -#include "shared-obj.hpp" +#include "shared-object.hpp" namespace bt2 { namespace internal { @@ -43,7 +43,7 @@ struct ValueRefFuncs final } /* namespace internal */ template -using SharedValue = SharedObj; +using SharedValue = SharedObject; template class CommonNullValue; -- 2.34.1