Browse Source

Fixed some VS2015 compiler errors

tags/2021-05-28
Tom Poole 7 years ago
parent
commit
4380b0e4a2
2 changed files with 15 additions and 0 deletions
  1. +8
    -0
      modules/juce_blocks_basics/littlefoot/juce_LittleFootCompiler.h
  2. +7
    -0
      modules/juce_blocks_basics/topology/juce_PhysicalTopologySource.cpp

+ 8
- 0
modules/juce_blocks_basics/littlefoot/juce_LittleFootCompiler.h View File

@@ -1324,6 +1324,14 @@ private:
struct Variable
{
// VS2015 requires a constructor to avoid aggregate initialization
Variable (const String& n, Type t, bool isGlobalVar, bool isConstVar, const var& cv,
int nElements = 0, Variable* pArray = nullptr, Variable* nArray = nullptr)
: name (n), type (t), isGlobal (isGlobalVar), isConst (isConstVar), constantValue (cv),
numElements (nElements), previousArray (pArray), nextArray (nArray)
{
}
String name;
Type type;
bool isGlobal, isConst;


+ 7
- 0
modules/juce_blocks_basics/topology/juce_PhysicalTopologySource.cpp View File

@@ -342,6 +342,13 @@ struct PhysicalTopologySource::Internal
//==============================================================================
struct DeviceInfo
{
// VS2015 requires a constructor to avoid aggregate initialization
DeviceInfo (Block::UID buid, BlocksProtocol::TopologyIndex tidx, BlocksProtocol::BlockSerialNumber s,
BlocksProtocol::VersionNumber v, BlocksProtocol::BlockName n, bool master = false)
: uid (buid), index (tidx), serial (s), version (v), name (n), isMaster (master)
{
}
Block::UID uid {};
BlocksProtocol::TopologyIndex index;
BlocksProtocol::BlockSerialNumber serial;


Loading…
Cancel
Save