From 1e436f79b44e7c232e7e2ac9bdb413a099a418cd Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 9 Oct 2017 10:14:29 +0800 Subject: [PATCH] se::HandleObject is stricter. --- .../scripting/js-bindings/jswrapper/HandleObject.hpp | 10 ++++++++++ .../scripting/js-bindings/manual/jsb_box2d_manual.cpp | 2 +- .../scripting/js-bindings/manual/jsb_conversions.cpp | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/native/cocos/scripting/js-bindings/jswrapper/HandleObject.hpp b/native/cocos/scripting/js-bindings/jswrapper/HandleObject.hpp index 3475268b3f..8469fe534d 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/HandleObject.hpp +++ b/native/cocos/scripting/js-bindings/jswrapper/HandleObject.hpp @@ -1,5 +1,7 @@ #pragma once +#include + namespace se { class Object; @@ -72,6 +74,14 @@ public: } private: + HandleObject(const HandleObject&) = delete; + void operator=(const HandleObject&) = delete; + HandleObject(HandleObject&&) = delete; + void operator=(HandleObject&&) = delete; + + void* operator new(size_t size) = delete; + void operator delete(void*, size_t) = delete; + Object* _obj; friend class Object; }; diff --git a/native/cocos/scripting/js-bindings/manual/jsb_box2d_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_box2d_manual.cpp index db7559baae..6d69e1fff4 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_box2d_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_box2d_manual.cpp @@ -870,7 +870,7 @@ static bool js_box2dclasses_b2Body_GetJointList(se::State& s) b2Body* cobj = (b2Body *)s.nativeThisObject(); b2JointEdge* list = cobj->GetJointList(); - se::HandleObject arr = (se::Object::createArrayObject(0)); + se::HandleObject arr(se::Object::createArrayObject(0)); do { diff --git a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp index 6a88299af2..0e28bd180f 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp @@ -1726,7 +1726,7 @@ bool Data_to_seval(const cocos2d::Data& v, se::Value* ret) { assert(ret != nullptr); assert(!v.isNull()); - se::HandleObject obj = se::Object::createUint8TypedArray(v.getBytes(), v.getSize()); + se::HandleObject obj(se::Object::createUint8TypedArray(v.getBytes(), v.getSize())); ret->setObject(obj); return true; }