Skip to content

Commit bd96b7c

Browse files
committed
Fix build with custom DISTRHO_NAMESPACE
Signed-off-by: falkTX <falktx@falktx.com>
1 parent c355f1c commit bd96b7c

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

‎source/modules/water/xml/XmlDocument.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class XmlDocument
158158
String lastError, dtdText;
159159
StringArray tokenisedDTD;
160160
bool needToLoadDTD, ignoreEmptyTextElements;
161-
ScopedPointer<FileInputSource> inputSource;
161+
DISTRHO_NAMESPACE::ScopedPointer<FileInputSource> inputSource;
162162

163163
XmlElement* parseDocumentElement (CharPointer_UTF8, bool outer);
164164
void setLastError (const String&, bool carryOn);

‎source/utils/CarlaBackendUtils.hpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,8 @@ BinaryType getBinaryTypeFromString(const char* const ctype) noexcept
601601
CARLA_SAFE_ASSERT_RETURN(ctype != nullptr && ctype[0] != '\0', BINARY_NONE);
602602
carla_debug("CarlaBackend::getBinaryTypeFromString(\"%s\")", ctype);
603603

604+
using DISTRHO_NAMESPACE::String;
605+
604606
String stype(ctype);
605607

606608
if (stype.isEmpty())
@@ -746,6 +748,8 @@ PluginType getPluginTypeFromString(const char* const ctype) noexcept
746748
CARLA_SAFE_ASSERT_RETURN(ctype != nullptr && ctype[0] != '\0', PLUGIN_NONE);
747749
carla_debug("CarlaBackend::getPluginTypeFromString(\"%s\")", ctype);
748750

751+
using DISTRHO_NAMESPACE::String;
752+
749753
String stype(ctype);
750754

751755
if (stype.isEmpty())
@@ -796,6 +800,8 @@ PluginCategory getPluginCategoryFromName(const char* const name) noexcept
796800
CARLA_SAFE_ASSERT_RETURN(name != nullptr && name[0] != '\0', PLUGIN_CATEGORY_NONE);
797801
carla_debug("CarlaBackend::getPluginCategoryFromName(\"%s\")", name);
798802

803+
using DISTRHO_NAMESPACE::String;
804+
799805
String sname(name);
800806

801807
if (sname.isEmpty())

0 commit comments

Comments
 (0)