update boost

linx64/include/boost/test/tree/decorator.hpp

@@ -110,12 +110,12 @@ class BOOST_TEST_DECL stack_decorator : public decorator::base {
 public:
     explicit                stack_decorator() {}
 
-    virtual collector_t&    operator*() const;
+    collector_t&    operator*() const BOOST_OVERRIDE;
 
 private:
     // decorator::base interface
-    virtual void            apply( test_unit& tu );
-    virtual base_ptr        clone() const { return base_ptr(new stack_decorator()); }
+    void            apply( test_unit& tu ) BOOST_OVERRIDE;
+    base_ptr        clone() const BOOST_OVERRIDE { return base_ptr(new stack_decorator()); }
 };
 
 // ************************************************************************** //
@@ -128,8 +128,8 @@ public:
 
 private:
     // decorator::base interface
-    virtual void            apply( test_unit& tu );
-    virtual base_ptr        clone() const { return base_ptr(new label( m_label )); }
+    void            apply( test_unit& tu ) BOOST_OVERRIDE;
+    base_ptr        clone() const BOOST_OVERRIDE { return base_ptr(new label( m_label )); }
 
     // Data members
     const_string            m_label;
@@ -145,8 +145,8 @@ public:
 
 private:
     // decorator::base interface
-    virtual void            apply( test_unit& tu );
-    virtual base_ptr        clone() const { return base_ptr(new expected_failures( m_exp_fail )); }
+    void            apply( test_unit& tu ) BOOST_OVERRIDE;
+    base_ptr        clone() const BOOST_OVERRIDE { return base_ptr(new expected_failures( m_exp_fail )); }
 
     // Data members
     counter_t               m_exp_fail;
@@ -162,8 +162,8 @@ public:
 
 private:
     // decorator::base interface
-    virtual void            apply( test_unit& tu );
-    virtual base_ptr        clone() const { return base_ptr(new timeout( m_timeout )); }
+    void            apply( test_unit& tu ) BOOST_OVERRIDE;
+    base_ptr        clone() const BOOST_OVERRIDE { return base_ptr(new timeout( m_timeout )); }
 
     // Data members
     unsigned                m_timeout;
@@ -179,8 +179,8 @@ public:
 
 private:
     // decorator::base interface
-    virtual void            apply( test_unit& tu );
-    virtual base_ptr        clone() const { return base_ptr(new description( m_description )); }
+    void            apply( test_unit& tu ) BOOST_OVERRIDE;
+    base_ptr        clone() const BOOST_OVERRIDE { return base_ptr(new description( m_description )); }
 
     // Data members
     const_string            m_description;
@@ -196,8 +196,8 @@ public:
 
 private:
     // decorator::base interface
-    virtual void            apply( test_unit& tu );
-    virtual base_ptr        clone() const { return base_ptr(new depends_on( m_dependency )); }
+    void            apply( test_unit& tu ) BOOST_OVERRIDE;
+    base_ptr        clone() const BOOST_OVERRIDE { return base_ptr(new depends_on( m_dependency )); }
 
     // Data members
     const_string            m_dependency;
@@ -216,8 +216,8 @@ template<bool condition>
 class enable_if : public enable_if_impl {
 private:
     // decorator::base interface
-    virtual void            apply( test_unit& tu )   { this->apply_impl( tu, condition ); }
-    virtual base_ptr        clone() const            { return base_ptr(new enable_if<condition>()); }
+    void            apply( test_unit& tu ) BOOST_OVERRIDE   { this->apply_impl( tu, condition ); }
+    base_ptr        clone() const BOOST_OVERRIDE            { return base_ptr(new enable_if<condition>()); }
 };
 
 typedef enable_if<true> enabled;
@@ -234,8 +234,8 @@ public:
 
 private:
     // decorator::base interface
-    virtual void            apply( test_unit& tu );
-    virtual base_ptr        clone() const { return base_ptr(new fixture_t( m_impl )); }
+    void            apply( test_unit& tu ) BOOST_OVERRIDE;
+    base_ptr        clone() const BOOST_OVERRIDE { return base_ptr(new fixture_t( m_impl )); }
 
     // Data members
     test_unit_fixture_ptr m_impl;
@@ -281,8 +281,8 @@ public:
 
 private:
     // decorator::base interface
-    virtual void            apply( test_unit& tu );
-    virtual base_ptr        clone() const { return base_ptr(new precondition( m_precondition )); }
+    void            apply( test_unit& tu ) BOOST_OVERRIDE;
+    base_ptr        clone() const BOOST_OVERRIDE { return base_ptr(new precondition( m_precondition )); }
 
     // Data members
     predicate_t             m_precondition;

linx64/include/boost/test/tree/fixture.hpp

@@ -132,8 +132,8 @@ public:
 
 private:
     // Fixture interface
-    virtual void    setup()         { m_inst.reset( new F( m_arg ) ); setup_conditional(*m_inst); }
-    virtual void    teardown()      { teardown_conditional(*m_inst); m_inst.reset(); }
+    void    setup() BOOST_OVERRIDE         { m_inst.reset( new F( m_arg ) ); setup_conditional(*m_inst); }
+    void    teardown() BOOST_OVERRIDE      { teardown_conditional(*m_inst); m_inst.reset(); }
 
     // Data members
     scoped_ptr<F>   m_inst;
@@ -150,8 +150,8 @@ public:
 
 private:
     // Fixture interface
-    virtual void    setup()         { m_inst.reset( new F ); setup_conditional(*m_inst); }
-    virtual void    teardown()      { teardown_conditional(*m_inst); m_inst.reset(); }
+    void    setup() BOOST_OVERRIDE         { m_inst.reset( new F ); setup_conditional(*m_inst); }
+    void    teardown() BOOST_OVERRIDE      { teardown_conditional(*m_inst); m_inst.reset(); }
 
     // Data members
     scoped_ptr<F>   m_inst;
@@ -174,8 +174,8 @@ public:
 
 private:
     // Fixture interface
-    virtual void                setup()     { if( m_setup ) m_setup(); }
-    virtual void                teardown()  { if( m_teardown ) m_teardown(); }
+    void                setup() BOOST_OVERRIDE     { if( m_setup ) m_setup(); }
+    void                teardown() BOOST_OVERRIDE  { if( m_teardown ) m_teardown(); }
 
     // Data members
     boost::function<void ()>    m_setup;

linx64/include/boost/test/tree/global_fixture.hpp

@@ -43,10 +43,10 @@ public:
     void unregister_from_framework();
 
     // Dtor
-    virtual ~global_configuration();
+    ~global_configuration() BOOST_OVERRIDE;
 
     // Happens after the framework global observer init has been done
-    virtual int     priority() { return 1; }
+    int     priority() BOOST_OVERRIDE { return 1; }
 
 private:
     bool registered;
@@ -70,7 +70,7 @@ public:
     void unregister_from_framework();
 
     // Dtor
-    virtual ~global_fixture();
+    ~global_fixture() BOOST_OVERRIDE;
 
 private:
     bool registered;
@@ -87,12 +87,12 @@ struct global_configuration_impl : public global_configuration {
     }
 
     // test observer interface
-    virtual void    test_start( counter_t ) {
+    void    test_start( counter_t, test_unit_id ) BOOST_OVERRIDE {
         m_configuration_observer = new F;
     }
 
     // test observer interface
-    virtual void    test_finish()           {
+    void    test_finish() BOOST_OVERRIDE           {
         if(m_configuration_observer) {
             delete m_configuration_observer;
             m_configuration_observer = 0;
@@ -110,13 +110,13 @@ struct global_fixture_impl : public global_fixture {
     }
 
     // test fixture interface
-    virtual void setup()                    {
+    void setup() BOOST_OVERRIDE                    {
         m_fixture = new F;
         setup_conditional(*m_fixture);
     }
 
     // test fixture interface
-    virtual void teardown()                 {
+    void teardown() BOOST_OVERRIDE                 {
         if(m_fixture) {
             teardown_conditional(*m_fixture);
         }

linx64/include/boost/test/tree/observer.hpp

@@ -44,7 +44,8 @@ public:
     //!
     //! @param[in] number_of_test_cases indicates the number of test cases. Only active
     //! test cases are taken into account.
-    virtual void    test_start( counter_t /* number_of_test_cases */ ) {}
+    //! @param[in] root_test_unit_id the ID root of the test tree currently being tested
+    virtual void    test_start( counter_t /* number_of_test_cases */, test_unit_id /* root_test_unit_id */ ) {}
 
     //! Called after the framework ends executing the test cases
     //!

linx64/include/boost/test/tree/test_case_counter.hpp

@@ -34,13 +34,19 @@ namespace unit_test {
 class test_case_counter : public test_tree_visitor {
 public:
     // Constructor
-    test_case_counter() : p_count( 0 ) {}
+    // @param ignore_disabled ignore the status when counting
+    test_case_counter(bool ignore_status = false)
+    : p_count( 0 )
+    , m_ignore_status(ignore_status)
+    {}
 
     BOOST_READONLY_PROPERTY( counter_t, (test_case_counter)) p_count;
 private:
     // test tree visitor interface
-    virtual void    visit( test_case const& tc )                { if( tc.is_enabled() ) ++p_count.value; }
-    virtual bool    test_suite_start( test_suite const& ts )    { return ts.is_enabled(); }
+    void    visit( test_case const& tc ) BOOST_OVERRIDE                { if( m_ignore_status || tc.is_enabled() ) ++p_count.value; }
+    bool    test_suite_start( test_suite const& ts ) BOOST_OVERRIDE    { return m_ignore_status || ts.is_enabled(); }
+  
+    bool m_ignore_status;
 };
 
 } // namespace unit_test

linx64/include/boost/test/tree/test_case_template.hpp

@@ -19,8 +19,8 @@
 #include <boost/test/tree/test_unit.hpp>
 
 #include <boost/test/utils/class_properties.hpp>
-
 #include <boost/test/tree/observer.hpp>
+#include <boost/test/utils/algorithm.hpp>
 
 
 // Boost
@@ -94,6 +94,16 @@ struct generate_test_case_4_type {
 #else
         full_name += BOOST_CURRENT_FUNCTION;
 #endif
+
+        // replacing ',' by ', ' first, and then removing any double space
+        static const std::string to_replace[] =  { "class ", "struct ", ",", "  ", " <", " >"};
+        static const std::string replacement[] = { "", "" , ", ", " ", "<" , ">"};
+
+        full_name = unit_test::utils::replace_all_occurrences_of(
+            full_name,
+            to_replace, to_replace + sizeof(to_replace)/sizeof(to_replace[0]),
+            replacement, replacement + sizeof(replacement)/sizeof(replacement[0]));
+
         typedef typename boost::remove_reference<TestType>::type TestTypewoRef;
         if( boost::is_const<TestTypewoRef>::value )
             full_name += "_const";
@@ -126,7 +136,7 @@ private:
 
 class template_test_case_gen_base : public test_unit_generator {
 public:
-    virtual test_unit* next() const
+    test_unit* next() const BOOST_OVERRIDE
     {
         if( m_test_cases.empty() )
             return 0;

linx64/include/boost/test/tree/test_unit.hpp

@@ -114,8 +114,6 @@ protected:
     test_unit( const_string tu_name, const_string tc_file, std::size_t tc_line, test_unit_type t );
     // Master test suite constructor
     explicit                            test_unit( const_string module_name );
-
-private:
 };
 
 // ************************************************************************** //