mirror of
https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git
synced 2025-08-15 13:05:59 +08:00
Added detail namespace to prevent namespace conflicts
This commit is contained in:
parent
6dba104c54
commit
1f9a4b97a3
@ -16,10 +16,10 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
static JsonDocument JsonConstruct(const char* str)
|
static detail::JsonDocument JsonConstruct(const char* str)
|
||||||
{
|
{
|
||||||
JsonDocument doc;
|
detail::JsonDocument doc;
|
||||||
JsonParse(doc, str, strlen(str));
|
detail::JsonParse(doc, str, strlen(str));
|
||||||
return doc;
|
return doc;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -275,9 +275,9 @@ TEST_CASE("parse-integer", "[bounds-checking]") {
|
|||||||
|
|
||||||
err.clear();
|
err.clear();
|
||||||
{
|
{
|
||||||
JsonDocument o;
|
detail::JsonDocument o;
|
||||||
double nan = std::numeric_limits<double>::quiet_NaN();
|
double nan = std::numeric_limits<double>::quiet_NaN();
|
||||||
tinygltf::JsonAddMember(o, "int", json(nan));
|
tinygltf::detail::JsonAddMember(o, "int", detail::json(nan));
|
||||||
CHECK_FALSE(tinygltf::ParseIntegerProperty(
|
CHECK_FALSE(tinygltf::ParseIntegerProperty(
|
||||||
&result, &err, o,
|
&result, &err, o,
|
||||||
"int", true));
|
"int", true));
|
||||||
@ -321,9 +321,9 @@ TEST_CASE("parse-unsigned", "[bounds-checking]") {
|
|||||||
|
|
||||||
err.clear();
|
err.clear();
|
||||||
{
|
{
|
||||||
JsonDocument o;
|
detail::JsonDocument o;
|
||||||
double nan = std::numeric_limits<double>::quiet_NaN();
|
double nan = std::numeric_limits<double>::quiet_NaN();
|
||||||
tinygltf::JsonAddMember(o, "int", json(nan));
|
tinygltf::detail::JsonAddMember(o, "int", detail::json(nan));
|
||||||
CHECK_FALSE(tinygltf::ParseUnsignedProperty(
|
CHECK_FALSE(tinygltf::ParseUnsignedProperty(
|
||||||
&result, &err, o,
|
&result, &err, o,
|
||||||
"int", true));
|
"int", true));
|
||||||
|
1330
tiny_gltf.h
1330
tiny_gltf.h
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user