Browse Source

Fix build with custom DISTRHO_NAMESPACE

Signed-off-by: falkTX <falktx@falktx.com>
pull/1975/merge
falkTX 2 months ago
parent
commit
bd96b7c403
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 7 additions and 1 deletions
  1. +1
    -1
      source/modules/water/xml/XmlDocument.h
  2. +6
    -0
      source/utils/CarlaBackendUtils.hpp

+ 1
- 1
source/modules/water/xml/XmlDocument.h View File

@@ -158,7 +158,7 @@ private:
String lastError, dtdText; String lastError, dtdText;
StringArray tokenisedDTD; StringArray tokenisedDTD;
bool needToLoadDTD, ignoreEmptyTextElements; bool needToLoadDTD, ignoreEmptyTextElements;
ScopedPointer<FileInputSource> inputSource;
DISTRHO_NAMESPACE::ScopedPointer<FileInputSource> inputSource;
XmlElement* parseDocumentElement (CharPointer_UTF8, bool outer); XmlElement* parseDocumentElement (CharPointer_UTF8, bool outer);
void setLastError (const String&, bool carryOn); void setLastError (const String&, bool carryOn);


+ 6
- 0
source/utils/CarlaBackendUtils.hpp View File

@@ -601,6 +601,8 @@ BinaryType getBinaryTypeFromString(const char* const ctype) noexcept
CARLA_SAFE_ASSERT_RETURN(ctype != nullptr && ctype[0] != '\0', BINARY_NONE); CARLA_SAFE_ASSERT_RETURN(ctype != nullptr && ctype[0] != '\0', BINARY_NONE);
carla_debug("CarlaBackend::getBinaryTypeFromString(\"%s\")", ctype); carla_debug("CarlaBackend::getBinaryTypeFromString(\"%s\")", ctype);


using DISTRHO_NAMESPACE::String;

String stype(ctype); String stype(ctype);


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


using DISTRHO_NAMESPACE::String;

String stype(ctype); String stype(ctype);


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


using DISTRHO_NAMESPACE::String;

String sname(name); String sname(name);


if (sname.isEmpty()) if (sname.isEmpty())


Loading…
Cancel
Save