Remove some dead code for JSB (#13556)

This commit is contained in:
江战
2022-11-28 11:20:22 +08:00
committed by GitHub
parent 39cf36d243
commit 85f73eb8c2
2 changed files with 10 additions and 68 deletions
@@ -131,18 +131,9 @@ public:
private:
cc::IntrusivePtr<T> _ptr;
friend TypedPrivateObject<T>;
};
template <typename T>
inline typename std::enable_if_t<std::is_destructible<T>::value, void> cctryDelete(T *t) {
delete t;
}
template <typename T>
inline typename std::enable_if_t<!std::is_destructible<T>::value, void> cctryDelete(T *t) {
}
template <typename T>
class RawRefPrivateObject final : public TypedPrivateObject<T> {
public:
@@ -150,14 +141,14 @@ public:
explicit RawRefPrivateObject(T *p) : _ptr(p) {}
~RawRefPrivateObject() override {
static_assert(!std::is_same<T, void>::value, "void is not allowed!");
if (_allowGC) {
cctryDelete(_ptr);
if constexpr (std::is_destructible<T>::value) {
if (_allowGC) {
delete _ptr;
}
}
_ptr = nullptr;
}
// bool *getValidAddr() { return &_validate; }
void allowDestroyInGC() const override {
_allowGC = true;
}
+6 -55
View File
@@ -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 T>
typename std::enable_if<!std::is_pointer<T>::value, bool>::type
@@ -550,51 +546,6 @@ struct HolderType<const char *, false> {
inline type value() const { return data.c_str(); }
};
#define HOLD_UNBOUND_TYPE(FromType, IsReference) \
template <> \
struct HolderType<FromType, IsReference> { \
using type = FromType; \
using local_type = typename std::remove_pointer<FromType>::type; \
std::remove_const_t<local_type> data; \
std::remove_const_t<type> *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<cc::ArrayBuffer, true> {
using type = cc::ArrayBuffer;
using local_type = cc::ArrayBuffer;
local_type data;
std::remove_const_t<type> *ptr = nullptr;
inline type &value() { return data; }
};
template <typename R, typename... ARGS>
struct HolderType<std::function<R(ARGS...)>, true> {
using type = std::function<R(ARGS...)>;
using local_type = std::function<R(ARGS...)>;
local_type data;
std::remove_const_t<type> *ptr = nullptr;
inline type value() { return data; }
};
// template <typename T>
// struct HolderType<ccstd::optional<T>, true> {
// using NonconstT = typename std::remove_const<T>::type;
// using type = ccstd::optional<NonconstT>;
// using local_type = NonconstT;
// local_type data;
// std::remove_const_t<type> *ptr = nullptr;
// inline type value() { return std::make_optional<T>(data); }
// };
///////////////////////////////////convertion//////////////////////////////////////////////////////////
////////////////// optional
@@ -1242,12 +1193,12 @@ inline bool nativevalue_to_se(const ccstd::vector<bool> &from, se::Value &to, se
}
template <typename T>
typename std::enable_if<std::is_convertible<T, ccstd::string>::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 T>
typename std::enable_if<!std::is_convertible<T, ccstd::string>::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<T, ccstd::string>::value) {
obj->setProperty(key, value);
} else {
obj->setProperty(std::to_string(key), value);
}
}
template <typename K, typename V>