GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-17 03:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Compiler Warnings

Browse Source
This commit is contained in:
jrkoonce 2019-09-04 10:50:55 -05:00
parent 63419a11e1
commit 6ff95392b0
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/tester.cc
View File

@ -20,7 +20,7 @@ TEST_CASE("parse-error", "[parse]") {
std::string err; std::string err;
std::string warn; std::string warn;
bool ret = ctx.LoadASCIIFromString(&model, &err, &warn, "bora", strlen("bora"), /* basedir*/ ""); bool ret = ctx.LoadASCIIFromString(&model, &err, &warn, "bora", static_cast<int>(strlen("bora")), /* basedir*/ "");
REQUIRE(false == ret); REQUIRE(false == ret);

25
tiny_gltf.h
View File

@ -1015,6 +1015,7 @@ struct Mesh {
Value extras; Value extras;
Mesh() = default; Mesh() = default;
~Mesh() = default;
Mesh(const Mesh&) = default; Mesh(const Mesh&) = default;
Mesh(Mesh&& rhs) noexcept Mesh(Mesh&& rhs) noexcept
: name(std::move(rhs.name)) : name(std::move(rhs.name))
@ -1022,6 +1023,14 @@ struct Mesh {
, weights(std::move(rhs.weights)) , weights(std::move(rhs.weights))
, extensions(std::move(rhs.extensions)) , extensions(std::move(rhs.extensions))
, extras(std::move(rhs.extras)) {} , extras(std::move(rhs.extras)) {}
Mesh &operator=(const Mesh &) = default;
Mesh &operator=(Mesh &&rhs) {
if (&rhs != this) {
this->~Mesh();
new (reinterpret_cast<void *>(this)) Mesh(std::move(rhs));
}
return *this;
}
bool operator==(const Mesh &) const; bool operator==(const Mesh &) const;
}; };
@ -1062,6 +1071,13 @@ class Node {
~Node() {} ~Node() {}
Node &operator=(const Node &rhs) = default; Node &operator=(const Node &rhs) = default;
Node &operator=(Node &&rhs) {
if (&rhs != this) {
this->~Node();
new (reinterpret_cast<void *>(this)) Node(std::move(rhs));
}
return *this;
}
bool operator==(const Node &) const; bool operator==(const Node &) const;
@ -1107,6 +1123,7 @@ struct Asset {
Value extras; Value extras;
Asset() = default; Asset() = default;
~Asset() = default;
Asset(const Asset&) = default; Asset(const Asset&) = default;
Asset(Asset&& rhs) noexcept Asset(Asset&& rhs) noexcept
: version(std::move(rhs.version)) : version(std::move(rhs.version))
@ -1115,6 +1132,14 @@ struct Asset {
, copyright(std::move(rhs.copyright)) , copyright(std::move(rhs.copyright))
, extensions(std::move(rhs.extensions)) , extensions(std::move(rhs.extensions))
, extras(std::move(rhs.extras)) {} , extras(std::move(rhs.extras)) {}
Asset &operator=(const Asset &) = default;
Asset &operator=(Asset &&rhs) {
if (&rhs != this) {
this->~Asset();
new (reinterpret_cast<void *>(this)) Asset(std::move(rhs));
}
return *this;
}
bool operator==(const Asset &) const; bool operator==(const Asset &) const;
}; };