From 0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 14 May 2020 13:23:58 +0200 Subject: Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks Which means that reduz' beloved style which we all became used to will now be changed automatically to remove the first empty line. This makes us lean closer to 1TBS (the one true brace style) instead of hybridating it with some Allman-inspired spacing. There's still the case of braces around single-statement blocks that needs to be addressed (but clang-format can't help with that, but clang-tidy may if we agree about it). Part of #33027. --- core/reference.h | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'core/reference.h') diff --git a/core/reference.h b/core/reference.h index 5190f6ab11..972fd500d0 100644 --- a/core/reference.h +++ b/core/reference.h @@ -36,7 +36,6 @@ #include "core/safe_refcount.h" class Reference : public Object { - GDCLASS(Reference, Object); SafeRefCount refcount; SafeRefCount refcount_init; @@ -57,11 +56,9 @@ public: template class Ref { - T *reference = nullptr; void ref(const Ref &p_from) { - if (p_from.reference == reference) return; @@ -73,7 +70,6 @@ class Ref { } void ref_pointer(T *p_ref) { - ERR_FAIL_COND(!p_ref); if (p_ref->init_ref()) @@ -90,60 +86,48 @@ public: } _FORCE_INLINE_ bool operator<(const Ref &p_r) const { - return reference < p_r.reference; } _FORCE_INLINE_ bool operator==(const Ref &p_r) const { - return reference == p_r.reference; } _FORCE_INLINE_ bool operator!=(const Ref &p_r) const { - return reference != p_r.reference; } _FORCE_INLINE_ T *operator->() { - return reference; } _FORCE_INLINE_ T *operator*() { - return reference; } _FORCE_INLINE_ const T *operator->() const { - return reference; } _FORCE_INLINE_ const T *ptr() const { - return reference; } _FORCE_INLINE_ T *ptr() { - return reference; } _FORCE_INLINE_ const T *operator*() const { - return reference; } operator Variant() const { - return Variant(reference); } void operator=(const Ref &p_from) { - ref(p_from); } template void operator=(const Ref &p_from) { - Reference *refb = const_cast(static_cast(p_from.ptr())); if (!refb) { unref(); @@ -156,7 +140,6 @@ public: } void operator=(const Variant &p_variant) { - Object *object = p_variant.get_validated_object(); if (object == reference) { @@ -232,7 +215,6 @@ public: // mutexes will avoid more crashes? if (reference && reference->unreference()) { - memdelete(reference); } reference = nullptr; @@ -252,7 +234,6 @@ public: typedef Ref REF; class WeakRef : public Reference { - GDCLASS(WeakRef, Reference); ObjectID ref; @@ -272,23 +253,18 @@ public: template struct PtrToArg> { - _FORCE_INLINE_ static Ref convert(const void *p_ptr) { - return Ref(const_cast(reinterpret_cast(p_ptr))); } _FORCE_INLINE_ static void encode(Ref p_val, const void *p_ptr) { - *(Ref *)p_ptr = p_val; } }; template struct PtrToArg &> { - _FORCE_INLINE_ static Ref convert(const void *p_ptr) { - return Ref((T *)p_ptr); } }; -- cgit v1.2.3