Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-11-02 05:55:42 +00: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 1ecd828e27
commit 9dea81428d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tiny_gltf.h
+3 -3
View File
@@ -5644,8 +5644,8 @@ bool TinyGLTF::LoadBinaryFromFile(Model *model, std::string *err,
///////////////////////
// GLTF Serialization
///////////////////////
//namespace
//{
namespace
{
json JsonFromString(const char* s)
{
#ifdef TINYGLTF_USE_RAPIDJSON
@@ -5735,7 +5735,7 @@ bool TinyGLTF::LoadBinaryFromFile(Model *model, std::string *err,
(void)(o);
(void)(s);
}
//}
}
// typedef std::pair<std::string, json> json_object_pair;