| ip_filter.hpp | ip_filter.hpp | |||
|---|---|---|---|---|
| skipping to change at line 184 | skipping to change at line 184 | |||
| i = m_access_list.insert(i, range(first, fla gs)); | i = m_access_list.insert(i, range(first, fla gs)); | |||
| } | } | |||
| else if (i != m_access_list.begin() && prior(i)->acc ess == flags) | else if (i != m_access_list.begin() && prior(i)->acc ess == flags) | |||
| { | { | |||
| --i; | --i; | |||
| first_access = i->access; | first_access = i->access; | |||
| } | } | |||
| TORRENT_ASSERT(!m_access_list.empty()); | TORRENT_ASSERT(!m_access_list.empty()); | |||
| TORRENT_ASSERT(i != m_access_list.end()); | TORRENT_ASSERT(i != m_access_list.end()); | |||
| if (i != j) m_access_list.erase(next(i), j); | if (i != j) m_access_list.erase(boost::next(i), j); | |||
| if (i->start == first) | if (i->start == first) | |||
| { | { | |||
| // we can do this const-cast because we know that the new | // we can do this const-cast because we know that the new | |||
| // start address will keep the set correctly ordered | // start address will keep the set correctly ordered | |||
| const_cast<Addr&>(i->start) = first; | const_cast<Addr&>(i->start) = first; | |||
| const_cast<int&>(i->access) = flags; | const_cast<int&>(i->access) = flags; | |||
| } | } | |||
| else if (first_access != flags) | else if (first_access != flags) | |||
| { | { | |||
| m_access_list.insert(i, range(first, flags)) ; | m_access_list.insert(i, range(first, flags)) ; | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| version.hpp | version.hpp | |||
|---|---|---|---|---|
| skipping to change at line 38 | skipping to change at line 38 | |||
| ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
| POSSIBILITY OF SUCH DAMAGE. | POSSIBILITY OF SUCH DAMAGE. | |||
| */ | */ | |||
| #ifndef TORRENT_VERSION_HPP_INCLUDED | #ifndef TORRENT_VERSION_HPP_INCLUDED | |||
| #define TORRENT_VERSION_HPP_INCLUDED | #define TORRENT_VERSION_HPP_INCLUDED | |||
| #define LIBTORRENT_VERSION_MAJOR 0 | #define LIBTORRENT_VERSION_MAJOR 0 | |||
| #define LIBTORRENT_VERSION_MINOR 14 | #define LIBTORRENT_VERSION_MINOR 14 | |||
| #define LIBTORRENT_VERSION_TINY 7 | #define LIBTORRENT_VERSION_TINY 8 | |||
| #define LIBTORRENT_VERSION "0.14.7.0" | #define LIBTORRENT_VERSION "0.14.8.0" | |||
| #define LIBTORRENT_REVISION "$Rev: 4018 $" | #define LIBTORRENT_REVISION "$Rev: 4143 $" | |||
| #endif | #endif | |||
| End of changes. 2 change blocks. | ||||
| 3 lines changed or deleted | 3 lines changed or added | |||