Browse Source

Fixed deprecated operator= warnings

tempestpy_adaptions
Tim Quatmann 4 years ago
parent
commit
33a6687721
  1. 7
      src/storm/storage/jani/EdgeContainer.cpp
  2. 1
      src/storm/storage/jani/EdgeContainer.h
  3. 8
      src/storm/storage/jani/TemplateEdgeContainer.cpp
  4. 1
      src/storm/storage/jani/TemplateEdgeContainer.h

7
src/storm/storage/jani/EdgeContainer.cpp

@ -67,9 +67,12 @@ namespace storm {
e.setTemplateEdge(map[e.getTemplateEdge()]);
}
}
}
EdgeContainer& EdgeContainer::operator=(EdgeContainer const& other) {
EdgeContainer otherCpy(other);
this->templates = std::move(other.templates);
this->edges = std::move(other.edges);
}
void EdgeContainer::finalize(Model const& containingModel) {

1
src/storm/storage/jani/EdgeContainer.h

@ -91,6 +91,7 @@ namespace storm {
EdgeContainer() = default;
EdgeContainer(EdgeContainer const& other);
EdgeContainer& operator=(EdgeContainer const& other);
void clearConcreteEdges();
std::vector<Edge> const& getConcreteEdges() const;

8
src/storm/storage/jani/TemplateEdgeContainer.cpp

@ -8,5 +8,13 @@ namespace storm {
this->insert(std::make_shared<TemplateEdge>(*te));
}
}
TemplateEdgeContainer& TemplateEdgeContainer::operator=(const TemplateEdgeContainer& other) {
this->clear();
for (auto const& te : other) {
this->insert(std::make_shared<TemplateEdge>(*te));
}
return *this;
}
}
}

1
src/storm/storage/jani/TemplateEdgeContainer.h

@ -11,6 +11,7 @@ namespace storm {
struct TemplateEdgeContainer : public std::unordered_set<std::shared_ptr<TemplateEdge>> {
TemplateEdgeContainer() = default;
TemplateEdgeContainer(TemplateEdgeContainer const& other);
TemplateEdgeContainer& operator=(TemplateEdgeContainer const& other);
};
}
}
Loading…
Cancel
Save