Commit a857b866 authored by Jørgen Lind's avatar Jørgen Lind
Browse files

Linux compile fixes

parent cbb94c87
......@@ -67,7 +67,7 @@ struct VDSHandle
std::vector<VolumeDataLayer::ProduceStatus>
ProduceStatuses;
MetadataContainer MetadataContainer;
class MetadataContainer MetadataContainer;
std::unique_ptr<VolumeDataLayoutImpl>
VolumeDataLayout;
......@@ -75,7 +75,7 @@ struct VDSHandle
DataAccessManager;
std::unique_ptr<IOManager>
IoManager;
LayerMetadataContainer
class LayerMetadataContainer
LayerMetadataContainer;
std::unique_ptr<VolumeDataRequestProcessor>
RequestProcessor;
......
......@@ -44,7 +44,7 @@ enum class Endianness
struct HeaderField
{
int ByteLocation;
FieldWidth FieldWidth;
enum FieldWidth FieldWidth;
HeaderField() = default;
HeaderField(int byteLocation, enum FieldWidth fieldWidth) : ByteLocation(byteLocation), FieldWidth(fieldWidth) {}
......
......@@ -37,7 +37,7 @@ struct DataBlock
{
VolumeDataChannelDescriptor::Format Format;
VolumeDataChannelDescriptor::Components Components;
Dimensionality Dimensionality;
enum Dimensionality Dimensionality;
int32_t Size[DataStoreDimensionality_Max];
int32_t AllocatedSize[DataStoreDimensionality_Max];
int32_t Pitch[DataStoreDimensionality_Max];
......
......@@ -27,7 +27,7 @@
#include <gtest/gtest.h>
static inline void GenerateRandomPosition(std::mt19937 &gen, const std::vector<std::uniform_real_distribution<float>> dimensionDistribution, int dimension, float (&pos)[OpenVDS::Dimensionality_Max])
static inline void GenerateRandomPosition(std::mt19937 &gen, std::vector<std::uniform_real_distribution<float>> &dimensionDistribution, int dimension, float (&pos)[OpenVDS::Dimensionality_Max])
{
for (int i = 0; i < dimension; i++)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment