Include rack:: namespace in APP and logger macros (DEBUG, INFO, WARN, FATAL).

include/app.hpp

@@ -49,7 +49,7 @@ void appDestroy();
 App* appGet();
 
 /** Accesses the global App pointer */
-#define APP appGet()
+#define APP rack::appGet()
 
 
 } // namespace rack

include/logger.hpp

@@ -9,10 +9,10 @@ will print something like
 
 	[0.123 debug myfile.cpp:45] error: 67
 */
-#define DEBUG(format, ...) logger::log(rack::logger::DEBUG_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
-#define INFO(format, ...) logger::log(rack::logger::INFO_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
-#define WARN(format, ...) logger::log(rack::logger::WARN_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
-#define FATAL(format, ...) logger::log(rack::logger::FATAL_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
+#define DEBUG(format, ...) rack::logger::log(rack::logger::DEBUG_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
+#define INFO(format, ...) rack::logger::log(rack::logger::INFO_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
+#define WARN(format, ...) rack::logger::log(rack::logger::WARN_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
+#define FATAL(format, ...) rack::logger::log(rack::logger::FATAL_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
 
 
 namespace rack {

include/rack.hpp

@@ -112,6 +112,9 @@ namespace rack {
 	using plugin::Model;
 	using namespace engine;
 	using namespace componentlibrary;
+
+	// Import namespace recursively to solve the problem of calling `rack::DEBUG(...)` which expands to `rack::rack::logger(...)`.
+	namespace rack = rack;
 #endif