Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r54202 - sandbox/monotonic/libs/monotonic/test
From: christian.schladetsch_at_[hidden]
Date: 2009-06-22 07:07:49


Author: cschladetsch
Date: 2009-06-22 07:07:46 EDT (Mon, 22 Jun 2009)
New Revision: 54202
URL: http://svn.boost.org/trac/boost/changeset/54202

Log:
fixes for GCC
Text files modified:
   sandbox/monotonic/libs/monotonic/test/PoolResult.h | 9 +++++----
   sandbox/monotonic/libs/monotonic/test/compare_memory_pool.cpp | 8 ++++----
   2 files changed, 9 insertions(+), 8 deletions(-)

Modified: sandbox/monotonic/libs/monotonic/test/PoolResult.h
==============================================================================
--- sandbox/monotonic/libs/monotonic/test/PoolResult.h (original)
+++ sandbox/monotonic/libs/monotonic/test/PoolResult.h 2009-06-22 07:07:46 EDT (Mon, 22 Jun 2009)
@@ -67,13 +67,14 @@
 
         void update_min(PoolResult const &other)
         {
- if (other.fast_pool_elapsed > 0)
+ // reject very small mins as we sometimes have 0-element tests
+ if (other.fast_pool_elapsed > 0.01)
                         fast_pool_elapsed = std::min(fast_pool_elapsed, other.fast_pool_elapsed);
- if (other.pool_elapsed > 0)
+ if (other.pool_elapsed > 0.01)
                         pool_elapsed = std::min(pool_elapsed, other.pool_elapsed);
- if (other.tbb_elapsed > 0)
+ if (other.tbb_elapsed > 0.01)
                         tbb_elapsed = std::min(tbb_elapsed, other.tbb_elapsed);
- if (other.std_elapsed > 0)
+ if (other.std_elapsed > 0.01)
                         std_elapsed = std::min(std_elapsed, other.std_elapsed);
         }
         void update_max(PoolResult const &other)

Modified: sandbox/monotonic/libs/monotonic/test/compare_memory_pool.cpp
==============================================================================
--- sandbox/monotonic/libs/monotonic/test/compare_memory_pool.cpp (original)
+++ sandbox/monotonic/libs/monotonic/test/compare_memory_pool.cpp 2009-06-22 07:07:46 EDT (Mon, 22 Jun 2009)
@@ -335,14 +335,14 @@
         {
                 heading("SMALL");
 #ifndef WIN32
- print(run_tests(50000, 100, 10, "list_create<int>", test_list_create<int>()));
- print(run_tests(50000, 100, 10, "list_sort<int>", test_list_sort<int>()));
+ print(run_tests(75000, 100, 10, "list_create<int>", test_list_create<int>()));
+ print(run_tests(75000, 100, 10, "list_sort<int>", test_list_sort<int>()));
                 print(run_tests(2000000, 100, 10, "vector_create<int>", test_vector_create()));
                 print(run_tests(200000, 100, 10, "vector_sort<int>", test_vector_sort<int>()));
                 print(run_tests(1000000, 100, 10, "vector_dupe", test_vector_dupe()));
- print(run_tests(20000, 100, 10, "list_dupe", test_list_dupe(), test_dupe_list_types));
+ print(run_tests(50000, 100, 10, "list_dupe", test_list_dupe(), test_dupe_list_types));
                 print(run_tests(500000, 100, 10, "vector_accumulate", test_vector_accumulate()));
- print(run_tests(5000, 100, 10, "set_vector", test_set_vector()));
+ print(run_tests(10000, 100, 10, "set_vector", test_set_vector()));
                 print(run_tests(10000, 100, 10, "map_vector<int>", test_map_vector<int>(), test_map_vector_types));
 #else
                 print(run_tests(50000, 100, 10, "list_create<int>", test_list_create<int>()));


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