Browse Source

Fixed a build error and warning on 10.6

tags/2021-05-28
ed 8 years ago
parent
commit
c1f564de98
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      examples/Demo/Source/Demos/GridDemo.cpp
  2. +1
    -1
      modules/juce_core/misc/juce_StdFunctionCompat.h

+ 1
- 1
examples/Demo/Source/Demos/GridDemo.cpp View File

@@ -27,7 +27,7 @@
#include "../JuceDemoHeader.h" #include "../JuceDemoHeader.h"
// these classes are C++11-only // these classes are C++11-only
#if JUCE_HAS_CONSTEXPR
#if JUCE_HAS_CONSTEXPR && JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS
struct GridDemo : public Component struct GridDemo : public Component
{ {


+ 1
- 1
modules/juce_core/misc/juce_StdFunctionCompat.h View File

@@ -154,7 +154,7 @@ namespace std
FunctorHolderBase<Result, Arguments...>* getFunctorStorage (int size) FunctorHolderBase<Result, Arguments...>* getFunctorStorage (int size)
{ {
return reinterpret_cast<FunctorHolderBase<Result, Arguments...>*> return reinterpret_cast<FunctorHolderBase<Result, Arguments...>*>
(size > functorHolderStackSize ? new char [size]
(size > functorHolderStackSize ? new char [static_cast<unsigned long> (size)]
: &(stackFunctorStorage[0])); : &(stackFunctorStorage[0]));
} }


Loading…
Cancel
Save