Skip to content
Snippets Groups Projects
Commit 93632183 authored by pnorbert's avatar pnorbert Committed by GitHub
Browse files

Merge pull request #105 from JasonRuonanWang/dataman

Fixed a compiling problem for Mac which is caused by conflicts between size_t and uint64_t
parents 61fcab23 c67482af
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ VariableCompound &ADIOS::DefineVariableCompound(const std::string &name, ...@@ -25,7 +25,7 @@ VariableCompound &ADIOS::DefineVariableCompound(const std::string &name,
const unsigned int size = m_Compound.size(); const unsigned int size = m_Compound.size();
m_Compound.emplace(size, VariableCompound(name, sizeof(T), dimensions, m_Compound.emplace(size, VariableCompound(name, sizeof(T), dimensions,
globalDimensions, globalOffsets, globalDimensions, globalOffsets,
m_DebugMode)); false, m_DebugMode));
m_Variables.emplace(name, std::make_pair(GetType<T>(), size)); m_Variables.emplace(name, std::make_pair(GetType<T>(), size));
return m_Compound.at(size); return m_Compound.at(size);
} }
......
...@@ -224,6 +224,7 @@ Variable<unsigned int> * ...@@ -224,6 +224,7 @@ Variable<unsigned int> *
Engine::InquireVariableUInt(const std::string & /*name*/, const bool /*readIn*/) Engine::InquireVariableUInt(const std::string & /*name*/, const bool /*readIn*/)
{ {
EngineThrowUp(m_EngineType, "InquireVariableUInt"); EngineThrowUp(m_EngineType, "InquireVariableUInt");
return nullptr;
} }
Variable<long int> *Engine::InquireVariableLInt(const std::string & /*name*/, Variable<long int> *Engine::InquireVariableLInt(const std::string & /*name*/,
const bool /*readIn*/) const bool /*readIn*/)
......
...@@ -155,8 +155,8 @@ public: ...@@ -155,8 +155,8 @@ public:
"Variable.SetSelection() for local or joined array '" + m_Name + "Variable.SetSelection() for local or joined array '" + m_Name +
"' should pass an empty 'start' argument\n"); "' should pass an empty 'start' argument\n");
} }
ConvertUint64VectorToSizetVector(count, m_Count); m_Count = count;
ConvertUint64VectorToSizetVector(start, m_Start); m_Start = start;
} }
/** /**
...@@ -165,7 +165,10 @@ public: ...@@ -165,7 +165,10 @@ public:
*/ */
void SetSelection(const SelectionBoundingBox &sel) 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);
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment