GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-14 11:45:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert accidental committed change

Browse Source 
Put "JsonX" helpers back in anonymous namespace to keep them inside local translation unit.
This commit is contained in:
jrkoonce 2019-09-03 17:06:41 -05:00
parent 06c30c4d04
commit 63419a11e1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tiny_gltf.h
View File

@ -5644,8 +5644,8 @@ bool TinyGLTF::LoadBinaryFromFile(Model *model, std::string *err,
/////////////////////// ///////////////////////
// GLTF Serialization // GLTF Serialization
/////////////////////// ///////////////////////
//namespace namespace
//{ {
json JsonFromString(const char* s) json JsonFromString(const char* s)
{ {
#ifdef TINYGLTF_USE_RAPIDJSON #ifdef TINYGLTF_USE_RAPIDJSON
@ -5735,7 +5735,7 @@ bool TinyGLTF::LoadBinaryFromFile(Model *model, std::string *err,
(void)(o); (void)(o);
(void)(s); (void)(s);
} }
//} }
// typedef std::pair<std::string, json> json_object_pair; // typedef std::pair<std::string, json> json_object_pair;