Browse Source

Clang: Fix errors when building with clang on windows with C++20 enabled

tags/2021-05-28
reuk 5 years ago
parent
commit
1502a3a8f2
No known key found for this signature in database GPG Key ID: 9ADCD339CFC98A11
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      modules/juce_dsp/widgets/juce_WaveShaper.h
  2. +2
    -2
      modules/juce_graphics/geometry/juce_PathIterator.cpp

+ 1
- 1
modules/juce_dsp/widgets/juce_WaveShaper.h View File

@@ -66,7 +66,7 @@ struct WaveShaper
//==============================================================================
// Although clang supports C++17, their standard library still has no invoke_result
// support. Remove the "|| JUCE_CLANG" once clang supports this properly!
#if (! JUCE_CXX17_IS_AVAILABLE) || JUCE_CLANG
#if (! JUCE_CXX17_IS_AVAILABLE) || (JUCE_CLANG && ! JUCE_WINDOWS)
template <typename Functor>
static WaveShaper<typename std::result_of<Functor>, Functor> CreateWaveShaper (Functor functionToUse) { return {functionToUse}; }
#else


+ 2
- 2
modules/juce_graphics/geometry/juce_PathIterator.cpp View File

@@ -64,7 +64,7 @@ bool PathFlatteningIterator::next()
{
float type;
if (stackPos == stackBase)
if (stackPos == stackBase.get())
{
if (source == path.data.end())
return false;
@@ -129,7 +129,7 @@ bool PathFlatteningIterator::next()
{
++subPathIndex;
closesSubPath = stackPos == stackBase
closesSubPath = stackPos == stackBase.get()
&& source != path.data.end()
&& *source == Path::closeSubPathMarker
&& x2 == subPathCloseX


Loading…
Cancel
Save