Skip to content

Commit e81efa2

Browse files
authored
Merge pull request #8 from hollance/master
fix Xcode compilation errors
2 parents df81798 + e1b7ab1 commit e81efa2

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
**/Builds
22
**/JuceLibraryCode
3-
**/build
3+
**/build
4+
**/.DS_Store
5+

NEL-19.jucer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<JUCERPROJECT id="z7Rdwx" name="NEL" projectType="audioplug" useAppConfig="0"
4-
addUsingNamespaceToJuceHeader="0" jucerFormatVersion="1" pluginFormats="buildStandalone,buildVST3"
4+
addUsingNamespaceToJuceHeader="0" jucerFormatVersion="1" pluginFormats="buildAU,buildStandalone,buildVST3"
55
pluginName="NEL" pluginDesc="Creative Vibrato For Travellers"
66
pluginManufacturer="Florian Mrugalla" pluginVST3Category="Modulation"
77
pluginRTASCategory="32" pluginAAXCategory="32" pluginCharacteristicsValue="pluginWantsMidiIn"

Source/dsp/Wavetable.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ namespace dsp
143143
{
144144
static constexpr Float MaxTablesF = static_cast<Float>(NumTables - 1);
145145
using Table = Wavetable<Float, WTSize>;
146-
using Func = Table::Func;
146+
using Func = typename Table::Func;
147147
using Tables = std::array<Table, NumTables + 1>;
148148

149149
Wavetable2D() :
@@ -211,7 +211,7 @@ namespace dsp
211211
static constexpr Float NumTablesInv = static_cast<Float>(1) / static_cast<Float>(NumTables);
212212

213213
using Table = Wavetable2D<Float, WTSize, NumTables>;
214-
using Func = Table::Func;
214+
using Func = typename Table::Func;
215215
using Funcs = std::array<Func, NumTables>;
216216

217217
void makeTablesWeierstrass()
@@ -295,4 +295,4 @@ namespace dsp
295295
static constexpr int LFOTableSize = 1 << 11;
296296
static constexpr int LFONumTables = (1 << 5) + 1;
297297
using LFOTables = Wavetable3D<double, LFOTableSize, LFONumTables>;
298-
}
298+
}

Source/oversampling/ConvolutionFilter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ namespace oversampling
173173
struct ConvolutionFilter
174174
{
175175
using Convolution = Convolution<Float>;
176-
using IR = Convolution::IR;
176+
using IR = typename Convolution::IR;
177177

178178
ConvolutionFilter(Float _Fs = static_cast<Float>(1),
179179
Float _cutoff = static_cast<Float>(.25), Float _bandwidth = static_cast<Float>(.25),
@@ -214,4 +214,4 @@ namespace oversampling
214214
IR ir;
215215
std::array<Convolution, 4> filters;
216216
};
217-
}
217+
}

0 commit comments

Comments
 (0)