From a0db644e2286e6a03b232c9e8723455dba199e6f Mon Sep 17 00:00:00 2001 From: Noah Dayan Date: Wed, 6 Dec 2017 11:48:47 +0000 Subject: [PATCH] Fix Doxygen bug with Singleton macros --- modules/juce_analytics/analytics/juce_Analytics.h | 3 ++- .../juce_gui_basics/components/juce_ModalComponentManager.h | 2 ++ modules/juce_gui_extra/misc/juce_PushNotifications.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/juce_analytics/analytics/juce_Analytics.h b/modules/juce_analytics/analytics/juce_Analytics.h index 43009c1e88..79d806dabd 100644 --- a/modules/juce_analytics/analytics/juce_Analytics.h +++ b/modules/juce_analytics/analytics/juce_Analytics.h @@ -79,8 +79,9 @@ public: */ void setSuspended (bool shouldBeSuspended); - + #ifndef DOXYGEN juce_DeclareSingleton (Analytics, true) + #endif private: //============================================================================== diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.h b/modules/juce_gui_basics/components/juce_ModalComponentManager.h index 1c7758eaad..698b3e1b53 100644 --- a/modules/juce_gui_basics/components/juce_ModalComponentManager.h +++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.h @@ -74,7 +74,9 @@ public: }; //============================================================================== + #ifndef DOXYGEN juce_DeclareSingleton_SingleThreaded_Minimal (ModalComponentManager) + #endif //============================================================================== /** Returns the number of components currently being shown modally. diff --git a/modules/juce_gui_extra/misc/juce_PushNotifications.h b/modules/juce_gui_extra/misc/juce_PushNotifications.h index 617a54d967..26e028b305 100644 --- a/modules/juce_gui_extra/misc/juce_PushNotifications.h +++ b/modules/juce_gui_extra/misc/juce_PushNotifications.h @@ -44,7 +44,9 @@ namespace juce class JUCE_API PushNotifications { public: + #ifndef DOXYGEN juce_DeclareSingleton (PushNotifications, false) + #endif //========================================================================== /** Represents a notification that can be sent or received. */