From 8a0e16c1e42702b70fc09a159c772760f24eae2c Mon Sep 17 00:00:00 2001
From: Jason Wang <wangr1@ornl.gov>
Date: Tue, 9 May 2017 17:22:53 -0400
Subject: [PATCH] fixed a few conflicts of size_t and uint64_t on mac
---
source/adios2/ADIOS.inl | 2 +-
source/adios2/core/Engine.cpp | 1 +
source/adios2/core/VariableBase.h | 11 ++++++++---
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/source/adios2/ADIOS.inl b/source/adios2/ADIOS.inl
index 6be677d62..553b34e98 100644
--- a/source/adios2/ADIOS.inl
+++ b/source/adios2/ADIOS.inl
@@ -24,7 +24,7 @@ VariableCompound &ADIOS::DefineVariableCompound(const std::string &name,
CheckVariableInput(name, dimensions);
const unsigned int size = m_Compound.size();
m_Compound.emplace(size, VariableCompound(name, sizeof(T), dimensions,
- globalDimensions, globalOffsets,
+ globalDimensions, globalOffsets, false,
m_DebugMode));
m_Variables.emplace(name, std::make_pair(GetType<T>(), size));
return m_Compound.at(size);
diff --git a/source/adios2/core/Engine.cpp b/source/adios2/core/Engine.cpp
index 81d17e756..af390ee59 100644
--- a/source/adios2/core/Engine.cpp
+++ b/source/adios2/core/Engine.cpp
@@ -224,6 +224,7 @@ Variable<unsigned int> *
Engine::InquireVariableUInt(const std::string & /*name*/, const bool /*readIn*/)
{
EngineThrowUp(m_EngineType, "InquireVariableUInt");
+ return nullptr;
}
Variable<long int> *Engine::InquireVariableLInt(const std::string & /*name*/,
const bool /*readIn*/)
diff --git a/source/adios2/core/VariableBase.h b/source/adios2/core/VariableBase.h
index 2509c851f..5f42708a1 100644
--- a/source/adios2/core/VariableBase.h
+++ b/source/adios2/core/VariableBase.h
@@ -155,8 +155,10 @@ public:
"Variable.SetSelection() for local or joined array '" + m_Name +
"' should pass an empty 'start' argument\n");
}
- ConvertUint64VectorToSizetVector(count, m_Count);
- ConvertUint64VectorToSizetVector(start, m_Start);
+// ConvertUint64VectorToSizetVector(count, m_Count);
+// ConvertUint64VectorToSizetVector(start, m_Start);
+ m_Count = count;
+ m_Start = start;
}
/**
@@ -165,7 +167,10 @@ public:
*/
void SetSelection(const SelectionBoundingBox &sel)
{
- SetSelection(sel.m_Start, sel.m_Count);
+ Dims start, count;
+ ConvertUint64VectorToSizetVector(sel.m_Start, start);
+ ConvertUint64VectorToSizetVector(sel.m_Count, count);
+ SetSelection(start, count);
}
/**
--
GitLab