Browse Source

Fixed some VS2013 compiler errors

tags/2021-05-28
tpoole 7 years ago
parent
commit
b58a0f4be7
5 changed files with 19 additions and 9 deletions
  1. +2
    -2
      examples/Demo/Source/Demos/GridDemo.cpp
  2. +2
    -0
      modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
  3. +6
    -3
      modules/juce_core/containers/juce_SortedSet.h
  4. +6
    -4
      modules/juce_gui_basics/juce_gui_basics.cpp
  5. +3
    -0
      modules/juce_gui_basics/juce_gui_basics.h

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

@@ -27,7 +27,7 @@
#include "../JuceDemoHeader.h"
// these classes are C++11-only
#if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS
#if JUCE_HAS_CONSTEXPR
struct GridDemo : public Component
{
@@ -119,4 +119,4 @@ struct GridDemo : public Component
// This static object will register this demo type in a global list of demos..
static JuceDemoType<GridDemo> demo ("10 Components: GridDemo");
#endif // JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS
#endif // JUCE_HAS_CONSTEXPR

+ 2
- 0
modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h View File

@@ -184,6 +184,8 @@ private:
void componentParentHierarchyChanged (Component&) override { ed.updatePeer(); }
AudioProcessorEditor& ed;
JUCE_DECLARE_NON_COPYABLE (AudioProcessorEditorListener)
};
//==============================================================================


+ 6
- 3
modules/juce_core/containers/juce_SortedSet.h View File

@@ -55,19 +55,22 @@ class SortedSet
public:
//==============================================================================
/** Creates an empty set. */
SortedSet() noexcept = default;
// VS2013 doesn't allow defaulted noexcept constructors.
SortedSet() noexcept {}
/** Creates a copy of another set. */
SortedSet (const SortedSet&) = default;
/** Creates a copy of another set. */
SortedSet (SortedSet&&) noexcept = default;
// VS2013 doesn't allow defaulted noexcept constructors.
SortedSet (SortedSet&& other) noexcept : data (std::move (other.data)) {}
/** Makes a copy of another set. */
SortedSet& operator= (const SortedSet&) = default;
/** Makes a copy of another set. */
SortedSet& operator= (SortedSet&&) noexcept = default;
// VS2013 doesn't allow defaulted noexcept constructors.
SortedSet& operator= (SortedSet&& other) noexcept { data = std::move (other.data); return *this; }
/** Destructor. */
~SortedSet() noexcept {}


+ 6
- 4
modules/juce_gui_basics/juce_gui_basics.cpp View File

@@ -259,10 +259,12 @@ extern bool juce_areThereAnyAlwaysOnTopWindows();
// these classes are C++11-only
#if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS
#include "layout/juce_FlexBox.cpp"
#include "layout/juce_GridItem.cpp"
#include "layout/juce_Grid.cpp"
#if JUCE_UNIT_TESTS
#include "layout/juce_GridUnitTests.cpp"
#if JUCE_HAS_CONSTEXPR
#include "layout/juce_GridItem.cpp"
#include "layout/juce_Grid.cpp"
#if JUCE_UNIT_TESTS
#include "layout/juce_GridUnitTests.cpp"
#endif
#endif
#endif


+ 3
- 0
modules/juce_gui_basics/juce_gui_basics.h View File

@@ -299,6 +299,9 @@ class DrawableButton;
#if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS
#include "layout/juce_FlexItem.h"
#include "layout/juce_FlexBox.h"
#endif
#if JUCE_HAS_CONSTEXPR
#include "layout/juce_GridItem.h"
#include "layout/juce_Grid.h"


Loading…
Cancel
Save