import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / test / test_framework_init_observer.hpp

diff --git a/ceph/src/boost/boost/test/test_framework_init_observer.hpp b/ceph/src/boost/boost/test/test_framework_init_observer.hpp
index cdf5ef5edd91c3fb1bc382f3ba7ce287e0da8bef..25c8bcb717a3f9edcc12c16ffa91cc47b0c5df4e 100644 (file)
--- a/ceph/src/boost/boost/test/test_framework_init_observer.hpp
+++ b/ceph/src/boost/boost/test/test_framework_init_observer.hpp
@@ -18,8 +18,6 @@
 #include <boost/test/detail/global_typedef.hpp>
 #include <boost/test/detail/fwd_decl.hpp>
 
-#include <boost/test/utils/trivial_singleton.hpp>
-
 #include <boost/test/detail/suppress_warnings.hpp>
 
 //____________________________________________________________________________//
@@ -33,16 +31,16 @@ namespace unit_test {
 /// This class collects the state of the init/termination of the unit test framework.
 ///
 /// @see boost::unit_test::test_observer
-class BOOST_TEST_DECL framework_init_observer_t : public test_observer, public singleton<framework_init_observer_t> {
+class BOOST_TEST_DECL framework_init_observer_t : public test_observer {
 public:
 
-    virtual void        test_start( counter_t );
+    void        test_start( counter_t, test_unit_id ) BOOST_OVERRIDE;
 
-    virtual void        assertion_result( unit_test::assertion_result );
-    virtual void        exception_caught( execution_exception const& );
-    virtual void        test_aborted();
+    void        assertion_result( unit_test::assertion_result ) BOOST_OVERRIDE;
+    void        exception_caught( execution_exception const& ) BOOST_OVERRIDE;
+    void        test_aborted() BOOST_OVERRIDE;
 
-    virtual int         priority() { return 0; }
+    int         priority() BOOST_OVERRIDE { return 0; }
 
     void                clear();
 
@@ -50,11 +48,9 @@ public:
     bool                has_failed( ) const;
 
 private:
-    BOOST_TEST_SINGLETON_CONS( framework_init_observer_t )
+    bool m_has_failure;
 };
 
-BOOST_TEST_SINGLETON_INST( framework_init_observer )
-
 } // namespace unit_test
 } // namespace boost