From 63419a11e13506ad7a5aa62b306a816a299a5f0a Mon Sep 17 00:00:00 2001 From: jrkoonce <30676875+jrkoonce@users.noreply.github.com> Date: Tue, 3 Sep 2019 17:06:41 -0500 Subject: [PATCH] Revert accidental committed change Put "JsonX" helpers back in anonymous namespace to keep them inside local translation unit. --- tiny_gltf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tiny_gltf.h b/tiny_gltf.h index b6f0453..b8e1449 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -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 json_object_pair;