diff --git a/source/bridges/qtcreator/carla-bridge-plugin.pro b/source/bridges/qtcreator/carla-bridge-plugin.pro index 82d995185..d04ddee9e 100644 --- a/source/bridges/qtcreator/carla-bridge-plugin.pro +++ b/source/bridges/qtcreator/carla-bridge-plugin.pro @@ -127,6 +127,7 @@ HEADERS += \ # utils HEADERS += \ + ../../utils/CarlaUtils.hpp \ ../../utils/CarlaBackendUtils.hpp \ ../../utils/CarlaBridgeUtils.hpp \ ../../utils/CarlaJuceUtils.hpp \ @@ -137,8 +138,8 @@ HEADERS += \ ../../utils/CarlaShmUtils.hpp \ ../../utils/CarlaStateUtils.hpp \ ../../utils/CarlaVstUtils.hpp \ - ../../utils/CarlaUtils.hpp \ ../../utils/CarlaMutex.hpp \ + ../../utils/CarlaRingBuffer.hpp \ ../../utils/CarlaString.hpp \ ../../utils/Lv2AtomQueue.hpp \ ../../utils/RtList.hpp @@ -157,10 +158,11 @@ INCLUDEPATH = .. \ LIBS = -ldl LIBS += ../../backend/libcarla_native.a LIBS += ../../modules/juce_core.a -LIBS += ../../modules/dgl.a -LIBS += ../../modules/lilv.a LIBS += ../../modules/rtmempool.a LIBS += ../../modules/theme.a LIBS += ../../modules/widgets.a +LIBS += ../../modules/dgl.a +LIBS += ../../modules/lilv.a + QMAKE_CXXFLAGS *= -std=gnu++0x diff --git a/source/includes/lv2_rdf.hpp b/source/includes/lv2_rdf.hpp index 4cc291031..a281efe9f 100644 --- a/source/includes/lv2_rdf.hpp +++ b/source/includes/lv2_rdf.hpp @@ -575,11 +575,11 @@ struct LV2_RDF_Descriptor { Extensions(nullptr), UICount(0), UIs(nullptr) - { + { #ifndef CARLA_PROPER_CPP11_SUPPORT - Type[0] = Type[1] = 0x0; + Type[0] = Type[1] = 0x0; #endif - } + } ~LV2_RDF_Descriptor() { diff --git a/source/utils/Lv2AtomQueue.hpp b/source/utils/Lv2AtomQueue.hpp index 9209e8e33..aa0c3921a 100644 --- a/source/utils/Lv2AtomQueue.hpp +++ b/source/utils/Lv2AtomQueue.hpp @@ -44,7 +44,7 @@ public: if (fRetAtom.atom.size == 0 || fRetAtom.atom.type == 0) return nullptr; - CARLA_SAFE_ASSERT_RETURN(fRetAtom.atom.size < RING_BUFFER_SIZE, nullptr) + CARLA_SAFE_ASSERT_RETURN(fRetAtom.atom.size < RING_BUFFER_SIZE, nullptr); int32_t index = -1; tryRead(&index, sizeof(int32_t)); diff --git a/source/utils/RtList.hpp b/source/utils/RtList.hpp index e3e5a1053..595706c10 100644 --- a/source/utils/RtList.hpp +++ b/source/utils/RtList.hpp @@ -267,7 +267,7 @@ public: { data = list_entry(entry, Data, siblings); - CARLA_SAFE_ASSERT_CONTINUE(data != nullptr) + CARLA_SAFE_ASSERT_CONTINUE(data != nullptr); if (data->value == value) { @@ -293,7 +293,7 @@ public: { data = list_entry(entry, Data, siblings); - CARLA_SAFE_ASSERT_CONTINUE(data != nullptr) + CARLA_SAFE_ASSERT_CONTINUE(data != nullptr); if (data->value == value) {