Skip to content

Commit aee5017

Browse files
authored
Merge pull request #1491 from LLNL/bugfix/gunney/silence-warnings
Silence warnings
2 parents 550b991 + 440e735 commit aee5017

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/axom/multimat/multimat.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ bool AllocatorOnDevice(int allocatorId)
4949
return true;
5050
}
5151
#endif
52+
AXOM_UNUSED_VAR(allocatorId);
5253
return false;
5354
}
5455

@@ -509,6 +510,9 @@ void ScanRelationOffsetsRAJA(const axom::ArrayView<const IndexType> counts,
509510
}
510511
});
511512
#else
513+
AXOM_UNUSED_VAR(counts);
514+
AXOM_UNUSED_VAR(begins);
515+
AXOM_UNUSED_VAR(firstIndices);
512516
SLIC_ASSERT_MSG(
513517
false,
514518
"Calling ScanRelationOffsetsRAJA requires support for RAJA and Umpire.");

src/axom/primal/geometry/KnotVector.hpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -546,8 +546,6 @@ class KnotVector
546546
{
547547
SLIC_ASSERT(isValidSpan(span, t));
548548

549-
const int m_deg = getDegree();
550-
551549
axom::Array<axom::Array<T>> ders(n + 1);
552550

553551
axom::Array<axom::Array<T>> ndu(m_deg + 1), a(2);
@@ -838,4 +836,4 @@ template <typename T>
838836
struct axom::fmt::formatter<axom::primal::KnotVector<T>> : ostream_formatter
839837
{ };
840838

841-
#endif // AXOM_PRIMAL_KNOTVECTOR_HPP
839+
#endif // AXOM_PRIMAL_KNOTVECTOR_HPP

src/axom/slam/DynamicConstantRelation.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,9 @@ class DynamicConstantRelation : public /*Relation,*/ CardinalityPolicy
304304
{
305305
const auto SZ = relationCardinality();
306306
const auto beg_idx = idx * SZ;
307-
for(auto idx = beg_idx; idx < (beg_idx + SZ); ++idx)
307+
for(auto i = beg_idx; i < (beg_idx + SZ); ++i)
308308
{
309-
if(m_relationsVec[idx] != INVALID_INDEX)
309+
if(m_relationsVec[i] != INVALID_INDEX)
310310
{
311311
return true;
312312
}

0 commit comments

Comments
 (0)