From c48aab2e9eb0ea9cf79fef5380c9238d55c9f400 Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 8 Mar 2013 09:26:03 +0000 Subject: [PATCH] Added export flag to JSON class. --- modules/juce_core/json/juce_JSON.cpp | 9 ++++----- modules/juce_core/json/juce_JSON.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/juce_core/json/juce_JSON.cpp b/modules/juce_core/json/juce_JSON.cpp index 80bf40e1f5..e03df74d1a 100644 --- a/modules/juce_core/json/juce_JSON.cpp +++ b/modules/juce_core/json/juce_JSON.cpp @@ -329,11 +329,10 @@ public: } else if (v.isObject()) { - DynamicObject* const object = v.getDynamicObject(); - - jassert (object != nullptr); // Only DynamicObjects can be converted to JSON! - - writeObject (out, *object, indentLevel, allOnOneLine); + if (DynamicObject* const object = v.getDynamicObject()) + writeObject (out, *object, indentLevel, allOnOneLine); + else + jassertfalse; // Only DynamicObjects can be converted to JSON! } else { diff --git a/modules/juce_core/json/juce_JSON.h b/modules/juce_core/json/juce_JSON.h index 9ad90e42af..da09a86cab 100644 --- a/modules/juce_core/json/juce_JSON.h +++ b/modules/juce_core/json/juce_JSON.h @@ -43,7 +43,7 @@ class File; @see var */ -class JSON +class JUCE_API JSON { public: //==============================================================================