#include <cstdint>
#include <type_traits>
+
#include <babeltrace2/babeltrace.h>
+#include "borrowed-object.hpp"
#include "common-iter.hpp"
-#include "internal/borrowed-obj.hpp"
-#include "internal/utils.hpp"
-#include "integer-range.hpp"
#include "exc.hpp"
+#include "integer-range.hpp"
+#include "internal/utils.hpp"
+#include "shared-obj.hpp"
namespace bt2 {
class CommonTraceClass;
template <typename LibObjT>
-class CommonIntegerRangeSet final : public internal::BorrowedObj<LibObjT>
+class CommonIntegerRangeSet final : public BorrowedObject<LibObjT>
{
/* Allow operator==() to call `other.libObjPtr()` */
friend class CommonIntegerRangeSet<bt_integer_range_set_unsigned>;
friend class CommonTraceClass<bt_trace_class>;
private:
- using typename internal::BorrowedObj<LibObjT>::_ThisBorrowedObj;
- using typename internal::BorrowedObj<LibObjT>::_LibObjPtr;
+ using typename BorrowedObject<LibObjT>::_ThisBorrowedObject;
+ using typename BorrowedObject<LibObjT>::_LibObjPtr;
using _ConstLibObjT = typename std::add_const<LibObjT>::type;
using _RefFuncs = internal::IntegerRangeSetRefFuncs<_ConstLibObjT>;
using _Spec = internal::CommonIntegerRangeSetSpec<_ConstLibObjT>;
using _ThisCommonIntegerRangeSet = CommonIntegerRangeSet<LibObjT>;
public:
- using Shared = internal::SharedObj<_ThisCommonIntegerRangeSet, LibObjT, _RefFuncs>;
+ using Shared = SharedObj<_ThisCommonIntegerRangeSet, LibObjT, _RefFuncs>;
using Range = typename std::conditional<
std::is_same<_ConstLibObjT, const bt_integer_range_set_unsigned>::value,
using Iterator = CommonIterator<CommonIntegerRangeSet, Range>;
explicit CommonIntegerRangeSet(const _LibObjPtr libObjPtr) noexcept :
- _ThisBorrowedObj {libObjPtr}
+ _ThisBorrowedObject {libObjPtr}
{
}
template <typename OtherLibObjT>
CommonIntegerRangeSet(const CommonIntegerRangeSet<OtherLibObjT> rangeSet) noexcept :
- _ThisBorrowedObj {rangeSet}
+ _ThisBorrowedObject {rangeSet}
{
}
_ThisCommonIntegerRangeSet&
operator=(const CommonIntegerRangeSet<OtherLibObjT> rangeSet) noexcept
{
- _ThisBorrowedObj::operator=(rangeSet);
+ _ThisBorrowedObject::operator=(rangeSet);
return *this;
}