From b30b92c0aaab7339cfa2648b35f11dcc2040626b Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 17 Aug 2014 00:14:02 +0100 Subject: [PATCH] Put all classes provided by DPF inside the namespace --- distrho/extra/d_leakdetector.hpp | 18 +++++++++++------- distrho/extra/d_mutex.hpp | 4 ++++ distrho/extra/d_scopedpointer.hpp | 4 ++++ distrho/extra/d_string.hpp | 4 ++++ distrho/src/DistrhoPluginJack.cpp | 2 ++ distrho/src/DistrhoPluginLV2.cpp | 4 ++-- distrho/src/DistrhoPluginVST.cpp | 4 ++-- 7 files changed, 29 insertions(+), 11 deletions(-) diff --git a/distrho/extra/d_leakdetector.hpp b/distrho/extra/d_leakdetector.hpp index 5dc9b408..2840c2db 100644 --- a/distrho/extra/d_leakdetector.hpp +++ b/distrho/extra/d_leakdetector.hpp @@ -19,6 +19,8 @@ #include "../DistrhoUtils.hpp" +START_NAMESPACE_DISTRHO + // ----------------------------------------------------------------------- // The following code was based from juce-core LeakDetector class // Copyright (C) 2013 Raw Material Software Ltd. @@ -45,10 +47,10 @@ }; \endcode */ -#define DISTRHO_LEAK_DETECTOR(ClassName) \ - friend class ::DistrhoLeakedObjectDetector; \ +#define DISTRHO_LEAK_DETECTOR(ClassName) \ + friend class DISTRHO_NAMESPACE::LeakedObjectDetector; \ static const char* getLeakedObjectClassName() noexcept { return #ClassName; } \ - ::DistrhoLeakedObjectDetector DISTRHO_JOIN_MACRO(leakDetector_, ClassName); + DISTRHO_NAMESPACE::LeakedObjectDetector DISTRHO_JOIN_MACRO(leakDetector_, ClassName); #define DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ClassName) \ DISTRHO_DECLARE_NON_COPY_CLASS(ClassName) \ @@ -67,14 +69,14 @@ class declaration. */ template -class DistrhoLeakedObjectDetector +class LeakedObjectDetector { public: //============================================================================== - DistrhoLeakedObjectDetector() noexcept { ++(getCounter().numObjects); } - DistrhoLeakedObjectDetector(const DistrhoLeakedObjectDetector&) noexcept { ++(getCounter().numObjects); } + LeakedObjectDetector() noexcept { ++(getCounter().numObjects); } + LeakedObjectDetector(const LeakedObjectDetector&) noexcept { ++(getCounter().numObjects); } - ~DistrhoLeakedObjectDetector() noexcept + ~LeakedObjectDetector() noexcept { if (--(getCounter().numObjects) < 0) { @@ -134,4 +136,6 @@ private: // ----------------------------------------------------------------------- +END_NAMESPACE_DISTRHO + #endif // DISTRHO_LEAK_DETECTOR_HPP_INCLUDED diff --git a/distrho/extra/d_mutex.hpp b/distrho/extra/d_mutex.hpp index 8bbcb114..df704e01 100644 --- a/distrho/extra/d_mutex.hpp +++ b/distrho/extra/d_mutex.hpp @@ -26,6 +26,8 @@ #include +START_NAMESPACE_DISTRHO + // ----------------------------------------------------------------------- // Mutex class @@ -223,4 +225,6 @@ typedef ScopedUnlocker RecursiveMutexUnlocker; // ----------------------------------------------------------------------- +END_NAMESPACE_DISTRHO + #endif // DISTRHO_MUTEX_HPP_INCLUDED diff --git a/distrho/extra/d_scopedpointer.hpp b/distrho/extra/d_scopedpointer.hpp index d7cc4eb7..b1a13520 100644 --- a/distrho/extra/d_scopedpointer.hpp +++ b/distrho/extra/d_scopedpointer.hpp @@ -21,6 +21,8 @@ #include +START_NAMESPACE_DISTRHO + // ----------------------------------------------------------------------- // The following code was based from juce-core ScopedPointer class // Copyright (C) 2013 Raw Material Software Ltd. @@ -240,4 +242,6 @@ bool operator!=(const ScopedPointer& pointer1, ObjectType* const poi // ----------------------------------------------------------------------- +END_NAMESPACE_DISTRHO + #endif // DISTRHO_SCOPED_POINTER_HPP_INCLUDED diff --git a/distrho/extra/d_string.hpp b/distrho/extra/d_string.hpp index 3020d901..0420c420 100644 --- a/distrho/extra/d_string.hpp +++ b/distrho/extra/d_string.hpp @@ -19,6 +19,8 @@ #include "d_leakdetector.hpp" +START_NAMESPACE_DISTRHO + // ----------------------------------------------------------------------- // d_string class @@ -743,4 +745,6 @@ d_string operator+(const char* const strBufBefore, const d_string& strAfter) noe // ----------------------------------------------------------------------- +END_NAMESPACE_DISTRHO + #endif // DISTRHO_STRING_HPP_INCLUDED diff --git a/distrho/src/DistrhoPluginJack.cpp b/distrho/src/DistrhoPluginJack.cpp index 20b8a470..8e8e13eb 100644 --- a/distrho/src/DistrhoPluginJack.cpp +++ b/distrho/src/DistrhoPluginJack.cpp @@ -374,6 +374,8 @@ END_NAMESPACE_DISTRHO int main() { + USE_NAMESPACE_DISTRHO; + jack_status_t status = jack_status_t(0x0); jack_client_t* client = jack_client_open(DISTRHO_PLUGIN_NAME, JackNoStartServer, &status); diff --git a/distrho/src/DistrhoPluginLV2.cpp b/distrho/src/DistrhoPluginLV2.cpp index 1a04e526..5f41c39b 100644 --- a/distrho/src/DistrhoPluginLV2.cpp +++ b/distrho/src/DistrhoPluginLV2.cpp @@ -50,10 +50,10 @@ #define DISTRHO_LV2_USE_EVENTS_IN (DISTRHO_PLUGIN_IS_SYNTH || DISTRHO_PLUGIN_WANT_TIMEPOS || (DISTRHO_PLUGIN_WANT_STATE && DISTRHO_PLUGIN_HAS_UI)) #define DISTRHO_LV2_USE_EVENTS_OUT (DISTRHO_PLUGIN_WANT_STATE && DISTRHO_PLUGIN_HAS_UI) -typedef std::map StringMap; - START_NAMESPACE_DISTRHO +typedef std::map StringMap; + // ----------------------------------------------------------------------- class PluginLv2 diff --git a/distrho/src/DistrhoPluginVST.cpp b/distrho/src/DistrhoPluginVST.cpp index 9c6d0dd6..075cb5b3 100644 --- a/distrho/src/DistrhoPluginVST.cpp +++ b/distrho/src/DistrhoPluginVST.cpp @@ -63,10 +63,10 @@ struct ERect { # warning VST TimePos still TODO (only basic BBT working) #endif -typedef std::map StringMap; - START_NAMESPACE_DISTRHO +typedef std::map StringMap; + // ----------------------------------------------------------------------- void strncpy(char* const dst, const char* const src, const size_t size)