RTAS: Fixed some namespacing around include paths

juce-framework · Oct 23, 2017 · afdb888 · afdb888
1 parent 1bd5292
commit afdb888
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 30 deletions.
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp
@@ -24,14 +24,11 @@
   ==============================================================================
 */
 
-namespace juce
-{
+#if JucePlugin_Build_RTAS
 
 #include "../../juce_core/system/juce_TargetPlatform.h"
 #include "../utility/juce_CheckSettingMacros.h"
 
-#if JucePlugin_Build_RTAS
-
 #include "juce_RTAS_DigiCode_Header.h"
 
 /*
@@ -78,5 +75,3 @@ namespace juce
 #endif
 
 #endif
-
-} // namespace juce
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp
@@ -24,14 +24,11 @@
   ==============================================================================
 */
 
-namespace juce
-{
+#if JucePlugin_Build_RTAS
 
 #include "../../juce_core/system/juce_TargetPlatform.h"
 #include "../utility/juce_CheckSettingMacros.h"
 
-#if JucePlugin_Build_RTAS
-
 #include "juce_RTAS_DigiCode_Header.h"
 
 #ifdef __clang__
@@ -66,5 +63,3 @@ namespace juce
 #endif
 
 #endif
-
-} // namespace juce
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp
@@ -24,9 +24,6 @@
   ==============================================================================
 */
 
-namespace juce
-{
-
 #include "../../juce_core/system/juce_TargetPlatform.h"
 #include "../utility/juce_CheckSettingMacros.h"
 
@@ -81,5 +78,3 @@ namespace juce
  #endif
 
 #endif
-
-} // namespace juce
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h
@@ -24,9 +24,6 @@
   ==============================================================================
 */
 
-namespace juce
-{
-
 #if JucePlugin_Build_RTAS
 #ifdef _MSC_VER
 
@@ -68,5 +65,3 @@ namespace juce
 
 #endif
 #endif
-
-} // namespace juce
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm
@@ -24,11 +24,11 @@
   ==============================================================================
 */
 
+#if JucePlugin_Build_RTAS
+
 #include "../../juce_core/system/juce_TargetPlatform.h"
 #include "../utility/juce_CheckSettingMacros.h"
 
-#if JucePlugin_Build_RTAS
-
 // Horrible carbon-based fix for a cocoa bug, where an NSWindow that wraps a carbon
 // window fails to keep its position updated when the user drags the window around..
 #define WINDOWPOSITION_BODGE 1
@@ -38,6 +38,11 @@
 #include "../utility/juce_IncludeModuleHeaders.h"
 #include "../utility/juce_CarbonVisibility.h"
 
+namespace juce
+{
+
+using namespace juce;
+
 //==============================================================================
 void initialiseMacRTAS();
 void initialiseMacRTAS()
@@ -165,4 +170,6 @@ void forwardCurrentKeyEventToHostWindow()
     }
 }
 
+} // namespace juce
+
 #endif
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp
@@ -24,14 +24,11 @@
   ==============================================================================
 */
 
-namespace juce
-{
+#if JucePlugin_Build_RTAS
 
 #include "../../juce_core/system/juce_TargetPlatform.h"
 #include "../utility/juce_CheckSettingMacros.h"
 
-#if JucePlugin_Build_RTAS
-
 #ifdef _MSC_VER
  // (this is a workaround for a build problem in VC9)
  #define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY
@@ -114,6 +111,11 @@ namespace juce
 
 #include "../utility/juce_IncludeModuleHeaders.h"
 
+using namespace juce;
+
+namespace juce
+{
+
 #ifdef _MSC_VER
  #pragma pack (pop)
 
@@ -1036,6 +1038,8 @@ class JucePlugInGroup   : public CEffectGroupMIDI
 
 void initialiseMacRTAS();
 
+} // namespace juce
+
 CProcessGroupInterface* CProcessGroup::CreateProcessGroup()
 {
    #if JUCE_MAC
@@ -1046,5 +1050,3 @@ CProcessGroupInterface* CProcessGroup::CreateProcessGroup()
 }
 
 #endif
-
-} // namespace juce