import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / test / tree / fixture.hpp

diff --git a/ceph/src/boost/boost/test/tree/fixture.hpp b/ceph/src/boost/boost/test/tree/fixture.hpp
index 8e07b2aa1d06fe6fffefa7e91e1bef77d9dad03a..a297ad9e9b32139dcd790d778d94cc73917713f1 100644 (file)
--- a/ceph/src/boost/boost/test/tree/fixture.hpp
+++ b/ceph/src/boost/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;