Skip to content
Snippets Groups Projects
Commit 8a0e16c1 authored by Wang, Ruonan's avatar Wang, Ruonan
Browse files

fixed a few conflicts of size_t and uint64_t on mac

parent 61fcab23
No related branches found
No related tags found
1 merge request!105Fixed a compiling problem for Mac which is caused by conflicts between size_t and uint64_t
......@@ -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);
......
......@@ -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*/)
......
......@@ -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);
}
/**
......
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