You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by is...@apache.org on 2020/05/21 09:51:26 UTC
[ignite] branch master updated: IGNITE-13043 C++: Fix compilation
when boost 1.71 is used
This is an automated email from the ASF dual-hosted git repository.
isapego pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new cc67aa1 IGNITE-13043 C++: Fix compilation when boost 1.71 is used
cc67aa1 is described below
commit cc67aa1b0b7500e4bddbea459669c57af8b03193
Author: Ivan Daschinskiy <iv...@gmail.com>
AuthorDate: Thu May 21 12:48:42 2020 +0300
IGNITE-13043 C++: Fix compilation when boost 1.71 is used
---
modules/platforms/cpp/core-test/src/teamcity_boost.cpp | 2 +-
modules/platforms/cpp/odbc-test/src/teamcity/teamcity_boost.cpp | 2 +-
modules/platforms/cpp/thin-client-test/src/teamcity/teamcity_boost.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/platforms/cpp/core-test/src/teamcity_boost.cpp b/modules/platforms/cpp/core-test/src/teamcity_boost.cpp
index 1a87fd4..f323842 100644
--- a/modules/platforms/cpp/core-test/src/teamcity_boost.cpp
+++ b/modules/platforms/cpp/core-test/src/teamcity_boost.cpp
@@ -151,7 +151,7 @@ void TeamcityBoostLogFormatter::log_build_info(std::ostream& /*out*/)
#if BOOST_VERSION >= 107000
// Since v1.70.0 the second argument indicates whether build info should be logged or not
// See boostorg/test.git:7e20f966dca4e4b49585bbe7654334f31b35b3db
-void log_build_info(std::ostream& os, bool log_build_info) override {
+void TeamcityBoostLogFormatter::log_build_info(std::ostream& os, bool log_build_info) {
if (log_build_info) this->log_build_info(os);
}
#endif
diff --git a/modules/platforms/cpp/odbc-test/src/teamcity/teamcity_boost.cpp b/modules/platforms/cpp/odbc-test/src/teamcity/teamcity_boost.cpp
index 1eba2d2..9aeb0c4 100644
--- a/modules/platforms/cpp/odbc-test/src/teamcity/teamcity_boost.cpp
+++ b/modules/platforms/cpp/odbc-test/src/teamcity/teamcity_boost.cpp
@@ -151,7 +151,7 @@ void TeamcityBoostLogFormatter::log_build_info(std::ostream& /*out*/)
#if BOOST_VERSION >= 107000
// Since v1.70.0 the second argument indicates whether build info should be logged or not
// See boostorg/test.git:7e20f966dca4e4b49585bbe7654334f31b35b3db
-void log_build_info(std::ostream& os, bool log_build_info) override {
+void TeamcityBoostLogFormatter::log_build_info(std::ostream& os, bool log_build_info) {
if (log_build_info) this->log_build_info(os);
}
#endif
diff --git a/modules/platforms/cpp/thin-client-test/src/teamcity/teamcity_boost.cpp b/modules/platforms/cpp/thin-client-test/src/teamcity/teamcity_boost.cpp
index 3efe9e5..e31283b 100644
--- a/modules/platforms/cpp/thin-client-test/src/teamcity/teamcity_boost.cpp
+++ b/modules/platforms/cpp/thin-client-test/src/teamcity/teamcity_boost.cpp
@@ -151,7 +151,7 @@ void TeamcityBoostLogFormatter::log_build_info(std::ostream& /*out*/)
#if BOOST_VERSION >= 107000
// Since v1.70.0 the second argument indicates whether build info should be logged or not
// See boostorg/test.git:7e20f966dca4e4b49585bbe7654334f31b35b3db
-void log_build_info(std::ostream& os, bool log_build_info) override {
+void TeamcityBoostLogFormatter::log_build_info(std::ostream& os, bool log_build_info) {
if (log_build_info) this->log_build_info(os);
}
#endif