diff options
Diffstat (limited to 'core/io/marshalls.cpp')
| -rw-r--r-- | core/io/marshalls.cpp | 16 | 
1 files changed, 8 insertions, 8 deletions
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 218a612da2..0282609270 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -851,7 +851,7 @@ static void _encode_string(const String &p_string, uint8_t *&buf, int &r_len) {  	if (buf) {  		encode_uint32(utf8.length(), buf);  		buf += 4; -		copymem(buf, utf8.get_data(), utf8.length()); +		memcpy(buf, utf8.get_data(), utf8.length());  		buf += utf8.length();  	} @@ -995,7 +995,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo  				if (buf) {  					encode_uint32(utf8.length(), buf);  					buf += 4; -					copymem(buf, utf8.get_data(), utf8.length()); +					memcpy(buf, utf8.get_data(), utf8.length());  					buf += pad + utf8.length();  				} @@ -1079,7 +1079,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo  				Transform2D val = p_variant;  				for (int i = 0; i < 3; i++) {  					for (int j = 0; j < 2; j++) { -						copymem(&buf[(i * 2 + j) * 4], &val.elements[i][j], sizeof(float)); +						memcpy(&buf[(i * 2 + j) * 4], &val.elements[i][j], sizeof(float));  					}  				}  			} @@ -1130,7 +1130,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo  				Basis val = p_variant;  				for (int i = 0; i < 3; i++) {  					for (int j = 0; j < 3; j++) { -						copymem(&buf[(i * 3 + j) * 4], &val.elements[i][j], sizeof(float)); +						memcpy(&buf[(i * 3 + j) * 4], &val.elements[i][j], sizeof(float));  					}  				}  			} @@ -1143,7 +1143,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo  				Transform val = p_variant;  				for (int i = 0; i < 3; i++) {  					for (int j = 0; j < 3; j++) { -						copymem(&buf[(i * 3 + j) * 4], &val.basis.elements[i][j], sizeof(float)); +						memcpy(&buf[(i * 3 + j) * 4], &val.basis.elements[i][j], sizeof(float));  					}  				} @@ -1258,7 +1258,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo  				if (buf) {  					encode_uint32(utf8.length()+1,buf);  					buf+=4; -					copymem(buf,utf8.get_data(),utf8.length()+1); +					memcpy(buf,utf8.get_data(),utf8.length()+1);  				}  				r_len+=4+utf8.length()+1; @@ -1314,7 +1314,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo  				encode_uint32(datalen, buf);  				buf += 4;  				const uint8_t *r = data.ptr(); -				copymem(buf, &r[0], datalen * datasize); +				memcpy(buf, &r[0], datalen * datasize);  				buf += datalen * datasize;  			} @@ -1412,7 +1412,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo  				if (buf) {  					encode_uint32(utf8.length() + 1, buf);  					buf += 4; -					copymem(buf, utf8.get_data(), utf8.length() + 1); +					memcpy(buf, utf8.get_data(), utf8.length() + 1);  					buf += utf8.length() + 1;  				}  |