[Boost-commit] svn:boost r82693 - sandbox/varray/example

Subject: [Boost-commit] svn:boost r82693 - sandbox/varray/example
From: athundt_at_[hidden]
Date: 2013-02-06 20:24:18

Author: ahundt
Date: 2013-02-02 18:06:24 EST (Sat, 02 Feb 2013)
New Revision: 82693
URL: http://svn.boost.org/trac/boost/changeset/82693

Log:
Merge branch 'bench'

Conflicts:
        example/bench_varray.cpp
Text files modified: 
   sandbox/varray/example/bench_varray.cpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: sandbox/varray/example/bench_varray.cpp
==============================================================================
--- sandbox/varray/example/bench_varray.cpp	(original)
+++ sandbox/varray/example/bench_varray.cpp	2013-02-02 18:06:24 EST (Sat, 02 Feb 2013)
@@ -94,10 +94,10 @@
         std::cout << "varray benchmark:\n";
         cpu_times tsv = time_it<boost::container::varray<boost::container::varray<std::size_t,N>,N > >();
         
-        std::cout << "vector benchmark with stack allocation\n";
+        std::cout << "vector benchmark\n";
         cpu_times tvs = time_it<boost::container::vector<boost::container::vector<std::size_t> > >();
         
-        std::cout << "vector benchmark\n";
+        std::cout << "vector benchmark with stack allocation\n";
         cpu_times tv = time_it<boost::container::vector<boost::container::vector<std::size_t,boost::signals2::detail::stack_allocator<std::size_t,N> > > >();
         
         std::cout << "varray/vector total time comparison:"