Browse Source

VectorBuffer: unsigned to signed

1vanK 3 năm trước cách đây
mục cha
commit
07b889ea91

+ 5 - 5
Source/Urho3D/AngelScript/Generated_Classes.cpp

@@ -4852,8 +4852,8 @@ static void VectorBuffer__VectorBuffer_constspVectorlesu8greamp(VectorBuffer* _p
     new(_ptr) VectorBuffer(data);
 }
 
-// VectorBuffer::VectorBuffer(Deserializer& source, unsigned size)
-static void VectorBuffer__VectorBuffer_Deserializeramp_unsigned(VectorBuffer* _ptr, Deserializer& source, unsigned size)
+// VectorBuffer::VectorBuffer(Deserializer& source, i32 size)
+static void VectorBuffer__VectorBuffer_Deserializeramp_i32(VectorBuffer* _ptr, Deserializer& source, i32 size)
 {
     new(_ptr) VectorBuffer(source, size);
 }
@@ -4861,13 +4861,13 @@ static void VectorBuffer__VectorBuffer_Deserializeramp_unsigned(VectorBuffer* _p
 // class VectorBuffer | File: ../IO/VectorBuffer.h
 static void Register_VectorBuffer(asIScriptEngine* engine)
 {
-    // VectorBuffer::VectorBuffer(const void* data, unsigned size)
+    // VectorBuffer::VectorBuffer(const void* data, i32 size)
     // Error: type "const void*" can not automatically bind
 
     // explicit VectorBuffer::VectorBuffer(const Vector<u8>& data)
     engine->RegisterObjectBehaviour("VectorBuffer", asBEHAVE_CONSTRUCT, "void f(Array<uint8>@+)", AS_FUNCTION_OBJFIRST(VectorBuffer__VectorBuffer_constspVectorlesu8greamp), AS_CALL_CDECL_OBJFIRST);
-    // VectorBuffer::VectorBuffer(Deserializer& source, unsigned size)
-    engine->RegisterObjectBehaviour("VectorBuffer", asBEHAVE_CONSTRUCT, "void f(Deserializer&, uint)", AS_FUNCTION_OBJFIRST(VectorBuffer__VectorBuffer_Deserializeramp_unsigned), AS_CALL_CDECL_OBJFIRST);
+    // VectorBuffer::VectorBuffer(Deserializer& source, i32 size)
+    engine->RegisterObjectBehaviour("VectorBuffer", asBEHAVE_CONSTRUCT, "void f(Deserializer&, int)", AS_FUNCTION_OBJFIRST(VectorBuffer__VectorBuffer_Deserializeramp_i32), AS_CALL_CDECL_OBJFIRST);
 
     // VectorBuffer::~VectorBuffer() | Implicitly-declared
     engine->RegisterObjectBehaviour("VectorBuffer", asBEHAVE_DESTRUCT, "void f()", AS_DESTRUCTOR(VectorBuffer), AS_CALL_CDECL_OBJFIRST);

+ 5 - 5
Source/Urho3D/AngelScript/Generated_Members.h

@@ -12447,7 +12447,7 @@ template <class T> void RegisterMembers_VectorBuffer(asIScriptEngine* engine, co
     // Error: type "const u8*" can not automatically bind
     // u8* VectorBuffer::GetModifiableData()
     // Error: type "u8*" can not automatically bind
-    // void VectorBuffer::SetData(const void* data, unsigned size)
+    // void VectorBuffer::SetData(const void* data, i32 size)
     // Error: type "const void*" can not automatically bind
 
     // void VectorBuffer::Clear()
@@ -12456,14 +12456,14 @@ template <class T> void RegisterMembers_VectorBuffer(asIScriptEngine* engine, co
     // const Vector<u8>& VectorBuffer::GetBuffer() const
     engine->RegisterObjectMethod(className, "Array<uint8>@ GetBuffer() const", AS_FUNCTION_OBJFIRST(VectorBuffer_constspVectorlesu8greamp_GetBuffer_void_template<VectorBuffer>), AS_CALL_CDECL_OBJFIRST);
 
-    // void VectorBuffer::Resize(unsigned size)
-    engine->RegisterObjectMethod(className, "void Resize(uint)", AS_METHODPR(T, Resize, (unsigned), void), AS_CALL_THISCALL);
+    // void VectorBuffer::Resize(i32 size)
+    engine->RegisterObjectMethod(className, "void Resize(int)", AS_METHODPR(T, Resize, (i32), void), AS_CALL_THISCALL);
 
     // void VectorBuffer::SetData(const Vector<u8>& data)
     engine->RegisterObjectMethod(className, "void SetData(Array<uint8>@+)", AS_FUNCTION_OBJFIRST(VectorBuffer_void_SetData_constspVectorlesu8greamp_template<VectorBuffer>), AS_CALL_CDECL_OBJFIRST);
 
-    // void VectorBuffer::SetData(Deserializer& source, unsigned size)
-    engine->RegisterObjectMethod(className, "void SetData(Deserializer&, uint)", AS_METHODPR(T, SetData, (Deserializer&, unsigned), void), AS_CALL_THISCALL);
+    // void VectorBuffer::SetData(Deserializer& source, i32 size)
+    engine->RegisterObjectMethod(className, "void SetData(Deserializer&, int)", AS_METHODPR(T, SetData, (Deserializer&, i32), void), AS_CALL_THISCALL);
 
     #ifdef REGISTER_MEMBERS_MANUAL_PART_VectorBuffer
         REGISTER_MEMBERS_MANUAL_PART_VectorBuffer();

+ 16 - 6
Source/Urho3D/IO/VectorBuffer.cpp

@@ -15,13 +15,17 @@ VectorBuffer::VectorBuffer(const Vector<u8>& data)
     SetData(data);
 }
 
-VectorBuffer::VectorBuffer(const void* data, unsigned size)
+VectorBuffer::VectorBuffer(const void* data, i32 size)
 {
+    assert(size >= 0);
+
     SetData(data, size);
 }
 
-VectorBuffer::VectorBuffer(Deserializer& source, unsigned size)
+VectorBuffer::VectorBuffer(Deserializer& source, i32 size)
 {
+    assert(size >= 0);
+
     SetData(source, size);
 }
 
@@ -79,8 +83,10 @@ void VectorBuffer::SetData(const Vector<u8>& data)
     size_ = data.Size();
 }
 
-void VectorBuffer::SetData(const void* data, unsigned size)
+void VectorBuffer::SetData(const void* data, i32 size)
 {
+    assert(size >= 0);
+
     if (!data)
         size = 0;
 
@@ -92,10 +98,12 @@ void VectorBuffer::SetData(const void* data, unsigned size)
     size_ = size;
 }
 
-void VectorBuffer::SetData(Deserializer& source, unsigned size)
+void VectorBuffer::SetData(Deserializer& source, i32 size)
 {
+    assert(size >= 0);
+
     buffer_.Resize(size);
-    unsigned actualSize = source.Read(&buffer_[0], size);
+    i32 actualSize = (i32)source.Read(&buffer_[0], size);
     if (actualSize != size)
         buffer_.Resize(actualSize);
 
@@ -110,8 +118,10 @@ void VectorBuffer::Clear()
     size_ = 0;
 }
 
-void VectorBuffer::Resize(unsigned size)
+void VectorBuffer::Resize(i32 size)
 {
+    assert(size >= 0);
+
     buffer_.Resize(size);
     size_ = size;
     if (position_ > size_)

+ 5 - 5
Source/Urho3D/IO/VectorBuffer.h

@@ -17,9 +17,9 @@ public:
     /// Construct from another buffer.
     explicit VectorBuffer(const Vector<u8>& data);
     /// Construct from a memory area.
-    VectorBuffer(const void* data, unsigned size);
+    VectorBuffer(const void* data, i32 size);
     /// Construct from a stream.
-    VectorBuffer(Deserializer& source, unsigned size);
+    VectorBuffer(Deserializer& source, i32 size);
 
     /// Read bytes from the buffer. Return number of bytes actually read.
     unsigned Read(void* dest, unsigned size) override;
@@ -31,13 +31,13 @@ public:
     /// Set data from another buffer.
     void SetData(const Vector<u8>& data);
     /// Set data from a memory area.
-    void SetData(const void* data, unsigned size);
+    void SetData(const void* data, i32 size);
     /// Set data from a stream.
-    void SetData(Deserializer& source, unsigned size);
+    void SetData(Deserializer& source, i32 size);
     /// Reset to zero size.
     void Clear();
     /// Set size.
-    void Resize(unsigned size);
+    void Resize(i32 size);
 
     /// Return data.
     const u8* GetData() const { return size_ ? &buffer_[0] : nullptr; }