|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68529 - in sandbox/icl: boost/icl libs/icl libs/icl/example libs/icl/test libs/icl/test/fix_icl_after_thread_ libs/icl/test/fix_include_after_thread_ libs/icl/test/test_casual_
From: afojgo_at_[hidden]
Date: 2011-01-28 07:15:07
Author: jofaber
Date: 2011-01-28 07:14:59 EST (Fri, 28 Jan 2011)
New Revision: 68529
URL: http://svn.boost.org/trac/boost/changeset/68529
Log:
Merged changes from trunk back to sandbox related to bug fix described in Ticket #5135.
Added:
sandbox/icl/libs/icl/test/fix_icl_after_thread_/
- copied from r68493, /trunk/libs/icl/test/fix_icl_after_thread_/
sandbox/icl/libs/icl/test/fix_icl_after_thread_/fix_icl_after_thread.cpp
- copied unchanged from r68493, /trunk/libs/icl/test/fix_icl_after_thread_/fix_icl_after_thread.cpp
sandbox/icl/libs/icl/test/fix_icl_after_thread_/vc9_fix_icl_after_thread.vcproj
- copied unchanged from r68493, /trunk/libs/icl/test/fix_icl_after_thread_/vc9_fix_icl_after_thread.vcproj
sandbox/icl/libs/icl/test/fix_include_after_thread_/
- copied from r68493, /trunk/libs/icl/test/fix_include_after_thread_/
sandbox/icl/libs/icl/test/fix_include_after_thread_/fix_include_after_thread.cpp
- copied unchanged from r68493, /trunk/libs/icl/test/fix_include_after_thread_/fix_include_after_thread.cpp
sandbox/icl/libs/icl/test/fix_include_after_thread_/vc9_fix_include_after_thread.vcproj
- copied unchanged from r68493, /trunk/libs/icl/test/fix_include_after_thread_/vc9_fix_include_after_thread.vcproj
Properties modified:
sandbox/icl/boost/icl/ (props changed)
sandbox/icl/libs/icl/ (props changed)
sandbox/icl/libs/icl/example/ (props changed)
sandbox/icl/libs/icl/test/ (props changed)
Text files modified:
sandbox/icl/libs/icl/test/Jamfile.v2 | 7 ++++++-
sandbox/icl/libs/icl/test/test_casual_/test_casual.cpp | 10 +++++-----
sandbox/icl/libs/icl/test/vc9_icl_fast_tests.sln | 12 ++++++++++++
3 files changed, 23 insertions(+), 6 deletions(-)
Modified: sandbox/icl/libs/icl/test/Jamfile.v2
==============================================================================
--- sandbox/icl/libs/icl/test/Jamfile.v2 (original)
+++ sandbox/icl/libs/icl/test/Jamfile.v2 2011-01-28 07:14:59 EST (Fri, 28 Jan 2011)
@@ -1,4 +1,4 @@
-# (C) Copyright 2008-2009: Joachim Faulhaber
+# (C) Copyright 2008-2011: Joachim Faulhaber
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,6 +10,7 @@
: requirements
<library>/boost/test//boost_unit_test_framework
<library>/boost/date_time//boost_date_time
+ <library>/boost/thread//boost_thread
<link>static
<include>../../..
;
@@ -59,4 +60,8 @@
# test_combinable is too slow or too large for some compilers
#[ run test_combinable_/test_combinable.cpp ]
[ run test_changing_interval_defaults_/test_changing_interval_defaults.cpp ]
+
+ # Bug fixes --------------------------------------------------------------
+ [ run fix_include_after_thread_/fix_include_after_thread.cpp ]
+ [ run fix_icl_after_thread_/fix_icl_after_thread.cpp ]
;
Modified: sandbox/icl/libs/icl/test/test_casual_/test_casual.cpp
==============================================================================
--- sandbox/icl/libs/icl/test/test_casual_/test_casual.cpp (original)
+++ sandbox/icl/libs/icl/test/test_casual_/test_casual.cpp 2011-01-28 07:14:59 EST (Fri, 28 Jan 2011)
@@ -32,11 +32,11 @@
BOOST_AUTO_TEST_CASE(casual)
{
- typedef int T;
- typedef int U;
- typedef interval_map<T,U, total_absorber> IntervalMapT;
- typedef interval_set<T> IntervalSetT;
- typedef IntervalMapT::interval_type IntervalT;
+ //typedef int T;
+ //typedef int U;
+ //typedef interval_map<T,U, total_absorber> IntervalMapT;
+ //typedef interval_set<T> IntervalSetT;
+ //typedef IntervalMapT::interval_type IntervalT;
BOOST_CHECK_EQUAL(true, true);
}
Modified: sandbox/icl/libs/icl/test/vc9_icl_fast_tests.sln
==============================================================================
--- sandbox/icl/libs/icl/test/vc9_icl_fast_tests.sln (original)
+++ sandbox/icl/libs/icl/test/vc9_icl_fast_tests.sln 2011-01-28 07:14:59 EST (Fri, 28 Jan 2011)
@@ -53,6 +53,10 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_test_changing_interval_defaults", "test_changing_interval_defaults_\vc9_test_changing_interval_defalts.vcproj", "{EE61B7EF-EC45-4165-8B49-FD5B8D8A9FA0}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_fix_include_after_thread", "fix_include_after_thread_\vc9_fix_include_after_thread.vcproj", "{EE61B7EF-EC45-4165-8B49-FD5B8D7A9FA0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_fix_icl_after_thread", "fix_icl_after_thread_\vc9_fix_icl_after_thread.vcproj", "{EE61B7EF-EC45-4165-8B49-FD5B8D9A9FA0}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -163,6 +167,14 @@
{EE61B7EF-EC45-4165-8B49-FD5B8D8A9FA0}.Debug|Win32.Build.0 = Debug|Win32
{EE61B7EF-EC45-4165-8B49-FD5B8D8A9FA0}.Release|Win32.ActiveCfg = Release|Win32
{EE61B7EF-EC45-4165-8B49-FD5B8D8A9FA0}.Release|Win32.Build.0 = Release|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D7A9FA0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D7A9FA0}.Debug|Win32.Build.0 = Debug|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D7A9FA0}.Release|Win32.ActiveCfg = Release|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D7A9FA0}.Release|Win32.Build.0 = Release|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D9A9FA0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D9A9FA0}.Debug|Win32.Build.0 = Debug|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D9A9FA0}.Release|Win32.ActiveCfg = Release|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D9A9FA0}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
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