Skip to content

Commit 2ceee4f

Browse files
committed
[arcane:cartesianmesh] Fix compilation with macOS
1 parent 23217eb commit 2ceee4f

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

arcane/src/arcane/cartesianmesh/CartesianMeshAMRMng.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
/*---------------------------------------------------------------------------*/
1818
/*---------------------------------------------------------------------------*/
1919

20+
#include "arcane/core/ItemTypes.h"
21+
2022
#include "arcane/cartesianmesh/CartesianMeshGlobal.h"
2123

2224
/*---------------------------------------------------------------------------*/

arcane/src/arcane/cartesianmesh/internal/AMRPatchPositionSignature.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ fillSig()
216216
continue;
217217
}
218218

219-
Integer pos_x = m_numbering->cellUniqueIdToCoordX(*icell);
220-
Integer pos_y = m_numbering->cellUniqueIdToCoordY(*icell);
221-
Integer pos_z = m_numbering->cellUniqueIdToCoordZ(*icell);
219+
const Int64 pos_x = m_numbering->cellUniqueIdToCoordX(*icell);
220+
const Int64 pos_y = m_numbering->cellUniqueIdToCoordY(*icell);
221+
const Int64 pos_z = m_numbering->cellUniqueIdToCoordZ(*icell);
222222

223223
if (
224224
pos_x < m_patch.minPoint().x || pos_x >= m_patch.maxPoint().x ||
@@ -252,24 +252,24 @@ fillSig()
252252
Int64x3 begin;
253253
Int64x3 end;
254254

255-
begin.x = std::max(min.x, 0l);
256-
end.x = std::min(max.x, m_sig_x.size() + 0l);
255+
begin.x = std::max(min.x, static_cast<Int64>(0));
256+
end.x = std::min(max.x, static_cast<Int64>(m_sig_x.size()));
257257

258-
begin.y = std::max(min.y, 0l);
259-
end.y = std::min(max.y, m_sig_y.size() + 0l);
258+
begin.y = std::max(min.y, static_cast<Int64>(0));
259+
end.y = std::min(max.y, static_cast<Int64>(m_sig_y.size()));
260260

261261
if (m_mesh->mesh()->dimension() == 2) {
262262
begin.z = 0;
263263
end.z = 1;
264264
}
265265
else {
266-
begin.z = std::max(min.z, 0l);
267-
end.z = std::min(max.z, m_sig_z.size() + 0l);
266+
begin.z = std::max(min.z, static_cast<Int64>(0));
267+
end.z = std::min(max.z, static_cast<Int64>(m_sig_z.size()));
268268
}
269269

270-
for (Integer k = begin.z; k < end.z; ++k) {
271-
for (Integer j = begin.y; j < end.y; ++j) {
272-
for (Integer i = begin.x; i < end.x; ++i) {
270+
for (Int64 k = begin.z; k < end.z; ++k) {
271+
for (Int64 j = begin.y; j < end.y; ++j) {
272+
for (Int64 i = begin.x; i < end.x; ++i) {
273273
m_sig_x[i]++;
274274
m_sig_y[j]++;
275275
m_sig_z[k]++;

0 commit comments

Comments
 (0)