Skip to content

Commit

Permalink
Avoid name conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
franzpoeschel committed Sep 5, 2024
1 parent 74fa621 commit 8182f44
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion include/openPMD/RecordComponent.tpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,8 @@ RecordComponent::storeChunk(Offset o, Extent e, F &&createBuffer)
* Flush the openPMD hierarchy to the backend without flushing any actual
* data yet.
*/
seriesFlush</* flush_entire_series = */ false>({FlushLevel::SkeletonOnly});
seriesFlush_impl</* flush_entire_series = */ false>(
{FlushLevel::SkeletonOnly});

size_t size = 1;
for (auto ext : e)
Expand Down
2 changes: 1 addition & 1 deletion include/openPMD/backend/Attributable.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ OPENPMD_protected
/** @} */

template <bool flush_entire_series>
void seriesFlush(internal::FlushParams const &);
void seriesFlush_impl(internal::FlushParams const &);

void flushAttributes(internal::FlushParams const &);

Expand Down
6 changes: 3 additions & 3 deletions src/backend/Attributable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,14 @@ void Attributable::touch()
}

template <bool flush_entire_series>
void Attributable::seriesFlush(internal::FlushParams const &flushParams)
void Attributable::seriesFlush_impl(internal::FlushParams const &flushParams)
{
writable().seriesFlush<flush_entire_series>(flushParams);
}
template void
Attributable::seriesFlush<true>(internal::FlushParams const &flushParams);
Attributable::seriesFlush_impl<true>(internal::FlushParams const &flushParams);
template void
Attributable::seriesFlush<false>(internal::FlushParams const &flushParams);
Attributable::seriesFlush_impl<false>(internal::FlushParams const &flushParams);

void Attributable::flushAttributes(internal::FlushParams const &flushParams)
{
Expand Down

0 comments on commit 8182f44

Please sign in to comment.