From 85f73eb8c2cd0fbca460e4911fa1cea7e3206d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=9F=E6=88=98?= <40414978+PatriceJiang@users.noreply.github.com> Date: Mon, 28 Nov 2022 11:20:22 +0800 Subject: [PATCH] Remove some dead code for JSB (#13556) --- .../cocos/bindings/jswrapper/PrivateObject.h | 17 ++---- .../cocos/bindings/manual/jsb_conversions.h | 61 ++----------------- 2 files changed, 10 insertions(+), 68 deletions(-) diff --git a/native/cocos/bindings/jswrapper/PrivateObject.h b/native/cocos/bindings/jswrapper/PrivateObject.h index 9b740be739..90e0277cc8 100644 --- a/native/cocos/bindings/jswrapper/PrivateObject.h +++ b/native/cocos/bindings/jswrapper/PrivateObject.h @@ -131,18 +131,9 @@ public: private: cc::IntrusivePtr _ptr; - friend TypedPrivateObject; }; -template -inline typename std::enable_if_t::value, void> cctryDelete(T *t) { - delete t; -} -template -inline typename std::enable_if_t::value, void> cctryDelete(T *t) { -} - template class RawRefPrivateObject final : public TypedPrivateObject { public: @@ -150,14 +141,14 @@ public: explicit RawRefPrivateObject(T *p) : _ptr(p) {} ~RawRefPrivateObject() override { static_assert(!std::is_same::value, "void is not allowed!"); - if (_allowGC) { - cctryDelete(_ptr); + if constexpr (std::is_destructible::value) { + if (_allowGC) { + delete _ptr; + } } _ptr = nullptr; } - // bool *getValidAddr() { return &_validate; } - void allowDestroyInGC() const override { _allowGC = true; } diff --git a/native/cocos/bindings/manual/jsb_conversions.h b/native/cocos/bindings/manual/jsb_conversions.h index e443c7db34..e05340309f 100644 --- a/native/cocos/bindings/manual/jsb_conversions.h +++ b/native/cocos/bindings/manual/jsb_conversions.h @@ -307,10 +307,6 @@ void cc_tmp_set_private_data(se::Object *obj, T *v) { // NOLINT(readability-iden } } -inline void cc_tmp_set_private_data(se::Object *obj, cc::gfx::Sampler *v) { // NOLINT(readability-identifier-naming) - obj->setRawPrivateData(v); -} - // handle reference template typename std::enable_if::value, bool>::type @@ -550,51 +546,6 @@ struct HolderType { inline type value() const { return data.c_str(); } }; -#define HOLD_UNBOUND_TYPE(FromType, IsReference) \ - template <> \ - struct HolderType { \ - using type = FromType; \ - using local_type = typename std::remove_pointer::type; \ - std::remove_const_t data; \ - std::remove_const_t *ptr = nullptr; \ - inline type value() { return &data; } \ - } - -HOLD_UNBOUND_TYPE(cc::Vec3 *, false); -HOLD_UNBOUND_TYPE(cc::Quaternion *, false); -HOLD_UNBOUND_TYPE(const cc::Mat4 *, false); -HOLD_UNBOUND_TYPE(cc::Color *, false); -HOLD_UNBOUND_TYPE(cc::geometry::Frustum *, false); -HOLD_UNBOUND_TYPE(cc::geometry::AABB *, false); - -template <> -struct HolderType { - using type = cc::ArrayBuffer; - using local_type = cc::ArrayBuffer; - local_type data; - std::remove_const_t *ptr = nullptr; - inline type &value() { return data; } -}; - -template -struct HolderType, true> { - using type = std::function; - using local_type = std::function; - local_type data; - std::remove_const_t *ptr = nullptr; - inline type value() { return data; } -}; - -// template -// struct HolderType, true> { -// using NonconstT = typename std::remove_const::type; -// using type = ccstd::optional; -// using local_type = NonconstT; -// local_type data; -// std::remove_const_t *ptr = nullptr; -// inline type value() { return std::make_optional(data); } -// }; - ///////////////////////////////////convertion////////////////////////////////////////////////////////// ////////////////// optional @@ -1242,12 +1193,12 @@ inline bool nativevalue_to_se(const ccstd::vector &from, se::Value &to, se } template -typename std::enable_if::value, void>::type cc_tmp_set_property(se::Object *obj, T &key, se::Value &value) { // NOLINT(readability-identifier-naming) - obj->setProperty(key, value); -} -template -typename std::enable_if::value, void>::type cc_tmp_set_property(se::Object *obj, T &str, se::Value &value) { // NOLINT(readability-identifier-naming) - obj->setProperty(std::to_string(str), value); +void cc_tmp_set_property(se::Object *obj, T &key, se::Value &value) { // NOLINT(readability-identifier-naming) + if constexpr (std::is_convertible::value) { + obj->setProperty(key, value); + } else { + obj->setProperty(std::to_string(key), value); + } } template