From d64279bb77e90e0c34f2cb632dbbb964b52110f0 Mon Sep 17 00:00:00 2001 From: dehnert Date: Sat, 18 Oct 2014 21:03:46 +0200 Subject: [PATCH] Stored iterators in bisimulation rather than const_iterators because of gcc. -.- Former-commit-id: c26147ae60fb72964206b95ffea13dafb9e4d3cc --- ...erministicModelStrongBisimulationDecomposition.cpp | 8 ++++---- ...eterministicModelStrongBisimulationDecomposition.h | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/storage/DeterministicModelStrongBisimulationDecomposition.cpp b/src/storage/DeterministicModelStrongBisimulationDecomposition.cpp index 1d455be2d..702cce376 100644 --- a/src/storage/DeterministicModelStrongBisimulationDecomposition.cpp +++ b/src/storage/DeterministicModelStrongBisimulationDecomposition.cpp @@ -84,22 +84,22 @@ namespace storm { } template - void DeterministicModelStrongBisimulationDecomposition::Block::setIterator(const_iterator it) { + void DeterministicModelStrongBisimulationDecomposition::Block::setIterator(iterator it) { this->selfIt = it; } template - typename DeterministicModelStrongBisimulationDecomposition::Block::const_iterator DeterministicModelStrongBisimulationDecomposition::Block::getIterator() const { + typename DeterministicModelStrongBisimulationDecomposition::Block::iterator DeterministicModelStrongBisimulationDecomposition::Block::getIterator() const { return this->selfIt; } template - typename DeterministicModelStrongBisimulationDecomposition::Block::const_iterator DeterministicModelStrongBisimulationDecomposition::Block::getNextIterator() const { + typename DeterministicModelStrongBisimulationDecomposition::Block::iterator DeterministicModelStrongBisimulationDecomposition::Block::getNextIterator() const { return this->getNextBlock().getIterator(); } template - typename DeterministicModelStrongBisimulationDecomposition::Block::const_iterator DeterministicModelStrongBisimulationDecomposition::Block::getPreviousIterator() const { + typename DeterministicModelStrongBisimulationDecomposition::Block::iterator DeterministicModelStrongBisimulationDecomposition::Block::getPreviousIterator() const { return this->getPreviousBlock().getIterator(); } diff --git a/src/storage/DeterministicModelStrongBisimulationDecomposition.h b/src/storage/DeterministicModelStrongBisimulationDecomposition.h index e5ac547db..48360923f 100644 --- a/src/storage/DeterministicModelStrongBisimulationDecomposition.h +++ b/src/storage/DeterministicModelStrongBisimulationDecomposition.h @@ -73,6 +73,7 @@ namespace storm { class Block { public: + typedef typename std::list::iterator iterator; typedef typename std::list::const_iterator const_iterator; Block(storm::storage::sparse::state_type begin, storm::storage::sparse::state_type end, Block* prev, Block* next, std::shared_ptr const& label = nullptr); @@ -102,16 +103,16 @@ namespace storm { storm::storage::sparse::state_type getOriginalBegin() const; // Returns the iterator the block in the list of overall blocks. - const_iterator getIterator() const; + iterator getIterator() const; // Returns the iterator the block in the list of overall blocks. - void setIterator(const_iterator it); + void setIterator(iterator it); // Returns the iterator the next block in the list of overall blocks if it exists. - const_iterator getNextIterator() const; + iterator getNextIterator() const; // Returns the iterator the next block in the list of overall blocks if it exists. - const_iterator getPreviousIterator() const; + iterator getPreviousIterator() const; // Gets the next block (if there is one). Block& getNextBlock(); @@ -194,7 +195,7 @@ namespace storm { private: // An iterator to itself. This is needed to conveniently insert elements in the overall list of blocks // kept by the partition. - const_iterator selfIt; + iterator selfIt; // Pointers to the next and previous block. Block* next;