Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ _build/
*.dir/
phlex-src
phlex-build/
CMakeCache.txt
CMakeFiles/
_deps/
_codeql_detected_source_root

# CMake user-specific presets (not generated by Spack)
CMakeUserPresets.json
Expand Down
10 changes: 5 additions & 5 deletions phlex/core/framework_graph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,18 @@ namespace phlex::experimental {
{
assert(store);
auto const new_depth = store->id()->depth();
while (not empty(levels_) and new_depth <= levels_.top().depth()) {
levels_.pop();
while (not empty(layers_) and new_depth <= layers_.top().depth()) {
layers_.pop();
eoms_.pop();
}
levels_.emplace(counters_, sender_, store);
layers_.emplace(counters_, sender_, store);
return store;
}

void framework_graph::drain()
{
while (not empty(levels_)) {
levels_.pop();
while (not empty(layers_)) {
layers_.pop();
eoms_.pop();
}
}
Expand Down
2 changes: 1 addition & 1 deletion phlex/core/framework_graph.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ namespace phlex::experimental {
message_sender sender_{hierarchy_, multiplexer_, eoms_};
std::queue<product_store_ptr> pending_stores_;
flush_counters counters_;
std::stack<layer_sentry> levels_;
std::stack<layer_sentry> layers_;
bool shutdown_{false};
};
}
Expand Down
6 changes: 3 additions & 3 deletions phlex/model/data_cell_index.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef PHLEX_MODEL_DATA_CELL_ID_HPP
#define PHLEX_MODEL_DATA_CELL_ID_HPP
#ifndef PHLEX_MODEL_DATA_CELL_INDEX_HPP
#define PHLEX_MODEL_DATA_CELL_INDEX_HPP

#include "phlex/model/fwd.hpp"

Expand Down Expand Up @@ -62,4 +62,4 @@ namespace std {
};
}

#endif // PHLEX_MODEL_DATA_CELL_ID_HPP
#endif // PHLEX_MODEL_DATA_CELL_INDEX_HPP
Loading