From 45befc9ed2923fac8d5cb89583c6a8bad04cee6f Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Sun, 3 Jan 2010 22:57:39 +0000 Subject: [PATCH] Small fix to ValueTree --- extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm | 6 +++--- juce_amalgamated.cpp | 2 +- src/containers/juce_ValueTree.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm b/extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm index a4340a8cc2..c06e945bff 100644 --- a/extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm +++ b/extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm @@ -543,7 +543,7 @@ public: return true; } - void sendAUEvent (const AudioUnitEventType type, const int index) throw() + void sendAUEvent (const AudioUnitEventType type, const int index) { if (AUEventListenerNotify != 0) { @@ -1185,8 +1185,8 @@ public: return noErr; } - AudioUnitCarbonViewEventListener getEventListener() const throw() { return mEventListener; } - void* getEventListenerUserData() const throw() { return mEventListenerUserData; } + AudioUnitCarbonViewEventListener getEventListener() const { return mEventListener; } + void* getEventListenerUserData() const { return mEventListenerUserData; } private: void deleteUI() diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 888d40b173..0a8d593ce7 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -16755,7 +16755,7 @@ int ValueTree::getNumChildren() const throw() ValueTree ValueTree::getChild (int index) const throw() { - return (SharedObject*) object->children [index]; + return object != 0 ? (SharedObject*) object->children [index] : ValueTree ((SharedObject*) 0); } ValueTree ValueTree::getChildWithName (const String& type) const throw() diff --git a/src/containers/juce_ValueTree.cpp b/src/containers/juce_ValueTree.cpp index 6cd5b48e6b..57fda6ab45 100644 --- a/src/containers/juce_ValueTree.cpp +++ b/src/containers/juce_ValueTree.cpp @@ -519,7 +519,7 @@ int ValueTree::getNumChildren() const throw() ValueTree ValueTree::getChild (int index) const throw() { - return (SharedObject*) object->children [index]; + return object != 0 ? (SharedObject*) object->children [index] : ValueTree ((SharedObject*) 0); } ValueTree ValueTree::getChildWithName (const String& type) const throw()