From: Tomasz Swierczek <t.swierczek@samsung.com>
Date: Mon, 23 Dec 2019 05:58:53 +0000 (+0100)
Subject: Revert "Mark colour_log_formatter methods as override"
X-Git-Tag: submit/tizen_5.5/20200103.003447^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab38ad09e112a6140253f59fababcc25c6e1064e;p=platform%2Fcore%2Fsecurity%2Fsecurity-manager.git

Revert "Mark colour_log_formatter methods as override"

This reverts commit 31bba785d8f2c84207f68e862751ec5fc421c2c5.

With older versions of boost, build-time errors occur with this patch
(marked 'override', but does not override).

Change-Id: I1dff4b41703a2896de60c1dbae82536f83636c04
---

diff --git a/test/colour_log_formatter.cpp b/test/colour_log_formatter.cpp
index b13c139a..c39e44e9 100644
--- a/test/colour_log_formatter.cpp
+++ b/test/colour_log_formatter.cpp
@@ -314,31 +314,30 @@ colour_log_formatter::entry_context_start(std::ostream& os, boost::unit_test::lo
     (void)os;
     (void)l;
 }
-#if BOOST_VERSION >= 106500
 void
-colour_log_formatter::log_entry_context(std::ostream& os, log_level l, const_string value)
+colour_log_formatter::log_entry_context(std::ostream& os, boost::unit_test::const_string value)
 {
     (void)os;
-    (void)l;
     (void)value;
 }
 void
-colour_log_formatter::entry_context_finish(std::ostream& os, log_level l)
+colour_log_formatter::entry_context_finish(std::ostream& os)
 {
     (void)os;
-    (void)l;
 }
-#else
+#if BOOST_VERSION >= 106501
 void
-colour_log_formatter::log_entry_context(std::ostream& os, boost::unit_test::const_string value)
+colour_log_formatter::log_entry_context(std::ostream& os, log_level l, const_string value)
 {
     (void)os;
+    (void)l;
     (void)value;
 }
 void
-colour_log_formatter::entry_context_finish(std::ostream& os)
+colour_log_formatter::entry_context_finish(std::ostream& os, log_level l)
 {
     (void)os;
+    (void)l;
 }
 #endif
 //____________________________________________________________________________//
diff --git a/test/colour_log_formatter.h b/test/colour_log_formatter.h
index e780bdff..69bd953e 100644
--- a/test/colour_log_formatter.h
+++ b/test/colour_log_formatter.h
@@ -20,8 +20,8 @@ class colour_log_formatter : public boost::unit_test::unit_test_log_formatter {
 public:
     // Formatter interface
     colour_log_formatter() : m_isTestCaseFailed(false) {}
-    void log_start(std::ostream &, boost::unit_test::counter_t test_cases_amount) override;
-    void log_finish(std::ostream &) override;
+    void log_start(std::ostream &, boost::unit_test::counter_t test_cases_amount);
+    void log_finish(std::ostream &);
 
 #if BOOST_VERSION >= 107000
     void log_build_info(std::ostream &, bool) override;
@@ -29,30 +29,29 @@ public:
     void log_build_info(std::ostream &) override;
 #endif
 
-    void test_unit_start(std::ostream &, boost::unit_test::test_unit const &tu) override;
+    void test_unit_start(std::ostream &, boost::unit_test::test_unit const &tu);
     void test_unit_finish(std::ostream &, boost::unit_test::test_unit const &tu,
-                          unsigned long elapsed) override;
-    void test_unit_skipped(std::ostream &, boost::unit_test::test_unit const &tu) override;
+                          unsigned long elapsed);
+    void test_unit_skipped(std::ostream &, boost::unit_test::test_unit const &tu);
 
     void log_exception_start(std::ostream &,
                              boost::unit_test::log_checkpoint_data const &,
-                             boost::execution_exception const &ex) override;
-    void log_exception_finish(std::ostream &os) override;
+                             boost::execution_exception const &ex);
+    void log_exception_finish(std::ostream &os);
 
     void log_entry_start(std::ostream &, boost::unit_test::log_entry_data const &,
-                         log_entry_types let) override;
-    void log_entry_value(std::ostream &, boost::unit_test::const_string value) override;
-    void log_entry_value(std::ostream &, boost::unit_test::lazy_ostream const &value) override;
-    void log_entry_finish(std::ostream &) override;
-
-    void entry_context_start(std::ostream& os, boost::unit_test::log_level l) override;
-
-#if BOOST_VERSION >= 106500
-    void log_entry_context(std::ostream& os, boost::unit_test::log_level l, boost::unit_test::const_string value) override;
-    void entry_context_finish(std::ostream& os, boost::unit_test::log_level l) override;
-#else
-    void log_entry_context(std::ostream& os, boost::unit_test::const_string value) override;
-    void entry_context_finish(std::ostream& os) override;
+                         log_entry_types let);
+    void log_entry_value(std::ostream &, boost::unit_test::const_string value);
+    void log_entry_value(std::ostream &, boost::unit_test::lazy_ostream const &value);
+    void log_entry_finish(std::ostream &);
+
+    void entry_context_start(std::ostream& os, boost::unit_test::log_level l);
+    void log_entry_context(std::ostream& os, boost::unit_test::const_string value);
+    void entry_context_finish(std::ostream& os);
+
+#if BOOST_VERSION >= 106501
+    void log_entry_context(std::ostream& os, boost::unit_test::log_level l, boost::unit_test::const_string value);
+    void entry_context_finish(std::ostream& os, boost::unit_test::log_level l);
 #endif
 
 private: