|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r56990 - in sandbox/itl: boost/itl libs/itl/build/win32 libs/itl/example/interval_container_ libs/itl/example/man_power_ libs/itl/example/month_and_week_grid_ libs/itl/example/overlap_counter_ libs/itl/example/party_ libs/itl/example/user_groups_
From: afojgo_at_[hidden]
Date: 2009-10-18 16:30:19
Author: jofaber
Date: 2009-10-18 16:30:17 EDT (Sun, 18 Oct 2009)
New Revision: 56990
URL: http://svn.boost.org/trac/boost/changeset/56990
Log:
Modified insert_range to make sure that iterator it_ points to the last interval always and not beyond.
Text files modified:
sandbox/itl/boost/itl/interval_map.hpp | 2 ++
sandbox/itl/boost/itl/split_interval_map.hpp | 3 +++
sandbox/itl/libs/itl/build/win32/vc9_all.sln | 6 ++++++
sandbox/itl/libs/itl/example/interval_container_/interval_container.cpp | 1 -
sandbox/itl/libs/itl/example/man_power_/man_power.cpp | 1 -
sandbox/itl/libs/itl/example/month_and_week_grid_/month_and_week_grid.cpp | 1 -
sandbox/itl/libs/itl/example/overlap_counter_/overlap_counter.cpp | 1 -
sandbox/itl/libs/itl/example/party_/party.cpp | 1 -
sandbox/itl/libs/itl/example/user_groups_/user_groups.cpp | 1 -
9 files changed, 11 insertions(+), 6 deletions(-)
Modified: sandbox/itl/boost/itl/interval_map.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_map.hpp (original)
+++ sandbox/itl/boost/itl/interval_map.hpp 2009-10-18 16:30:17 EDT (Sun, 18 Oct 2009)
@@ -686,6 +686,8 @@
inserted_ = this->_map.insert(prior_, value_type(end_gap, co_val));
it_ = join_neighbours(inserted_);
}
+ else
+ it_ = prior_;
}
Modified: sandbox/itl/boost/itl/split_interval_map.hpp
==============================================================================
--- sandbox/itl/boost/itl/split_interval_map.hpp (original)
+++ sandbox/itl/boost/itl/split_interval_map.hpp 2009-10-18 16:30:17 EDT (Sun, 18 Oct 2009)
@@ -544,6 +544,9 @@
interval_type end_gap = left_subtract(rest_interval, last_interval);
if(!end_gap.empty())
it_ = this->_map.insert(prior_, value_type(end_gap, co_val));
+ else
+ it_ = prior_;
+
}
Modified: sandbox/itl/libs/itl/build/win32/vc9_all.sln
==============================================================================
--- sandbox/itl/libs/itl/build/win32/vc9_all.sln (original)
+++ sandbox/itl/libs/itl/build/win32/vc9_all.sln 2009-10-18 16:30:17 EDT (Sun, 18 Oct 2009)
@@ -141,6 +141,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_labat_map_order", "..\..\..\validate\example\labat_map_order_\vc9_labat_map_order.vcproj", "{BF42574F-66E2-42DD-90D9-3A8FCE6F4727}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_std_copy", "..\..\example\std_copy_\vc9_std_copy.vcproj", "{8DC9BDE4-E5A4-4294-A12F-D75FD6990B84}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -427,6 +429,10 @@
{BF42574F-66E2-42DD-90D9-3A8FCE6F4727}.Debug|Win32.Build.0 = Debug|Win32
{BF42574F-66E2-42DD-90D9-3A8FCE6F4727}.Release|Win32.ActiveCfg = Release|Win32
{BF42574F-66E2-42DD-90D9-3A8FCE6F4727}.Release|Win32.Build.0 = Release|Win32
+ {8DC9BDE4-E5A4-4294-A12F-D75FD6990B84}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8DC9BDE4-E5A4-4294-A12F-D75FD6990B84}.Debug|Win32.Build.0 = Debug|Win32
+ {8DC9BDE4-E5A4-4294-A12F-D75FD6990B84}.Release|Win32.ActiveCfg = Release|Win32
+ {8DC9BDE4-E5A4-4294-A12F-D75FD6990B84}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: sandbox/itl/libs/itl/example/interval_container_/interval_container.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/interval_container_/interval_container.cpp (original)
+++ sandbox/itl/libs/itl/example/interval_container_/interval_container.cpp 2009-10-18 16:30:17 EDT (Sun, 18 Oct 2009)
@@ -19,7 +19,6 @@
\include interval_container_/interval_container.cpp
*/
//[example_interval_container
-#include <stdio.h>
#include <iostream>
#include <boost/itl/interval_set.hpp>
Modified: sandbox/itl/libs/itl/example/man_power_/man_power.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/man_power_/man_power.cpp (original)
+++ sandbox/itl/libs/itl/example/man_power_/man_power.cpp 2009-10-18 16:30:17 EDT (Sun, 18 Oct 2009)
@@ -22,7 +22,6 @@
\include man_power_/man_power.cpp
*/
//[example_man_power
-#include <stdio.h>
#include <iostream>
// The next line includes <boost/gregorian/date.hpp>
Modified: sandbox/itl/libs/itl/example/month_and_week_grid_/month_and_week_grid.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/month_and_week_grid_/month_and_week_grid.cpp (original)
+++ sandbox/itl/libs/itl/example/month_and_week_grid_/month_and_week_grid.cpp 2009-10-18 16:30:17 EDT (Sun, 18 Oct 2009)
@@ -27,7 +27,6 @@
\include month_and_week_grid_/month_and_week_grid.cpp
*/
//[example_month_and_week_grid
-#include <stdio.h>
#include <iostream>
// The next line includes <boost/gregorian/date.hpp>
Modified: sandbox/itl/libs/itl/example/overlap_counter_/overlap_counter.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/overlap_counter_/overlap_counter.cpp (original)
+++ sandbox/itl/libs/itl/example/overlap_counter_/overlap_counter.cpp 2009-10-18 16:30:17 EDT (Sun, 18 Oct 2009)
@@ -24,7 +24,6 @@
\include overlap_counter_/overlap_counter.cpp
*/
//[example_overlap_counter
-#include <stdio.h>
#include <iostream>
#include <boost/itl/split_interval_map.hpp>
Modified: sandbox/itl/libs/itl/example/party_/party.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/party_/party.cpp (original)
+++ sandbox/itl/libs/itl/example/party_/party.cpp 2009-10-18 16:30:17 EDT (Sun, 18 Oct 2009)
@@ -8,7 +8,6 @@
(See accompanying file LICENCE.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------------------------------------*/
-#include <stdio.h>
#include <iostream>
#include <boost/itl/interval_map.hpp>
#include "../toytime.hpp"
Modified: sandbox/itl/libs/itl/example/user_groups_/user_groups.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/user_groups_/user_groups.cpp (original)
+++ sandbox/itl/libs/itl/example/user_groups_/user_groups.cpp 2009-10-18 16:30:17 EDT (Sun, 18 Oct 2009)
@@ -31,7 +31,6 @@
\include user_groups_/user_groups.cpp
*/
//[example_user_groups
-#include <stdio.h>
#include <iostream>
// The next line includes <boost/gregorian/date.hpp>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk