tags 778058 + patch
thanks
Here's a fix for the GCC 5 build issue. Converted __PRETTY_FUNCTION__ to
__func__ to be compatible with new compilers.
--
Alexander Balderson
Linux for HP Helion OpenStack, Hewlett-Packard
Description: Fixes gcc5 build errors
Replacing __PRETTY_FUNCTION__ with __func__ to meet standards of gcc5.
percona-xtradb-cluster-galera-2.x (1:2.11.2675-1.1) UNRELEASED; urgency=medium
.
* Non-maintainer upload.
* d/p/gcc5.patch: Fixing to build under gcc5 by replacing __PRETTY_FUNCTION__
with __func__
Author: alexander balderson <alexander.balder...@hp.com>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- percona-xtradb-cluster-galera-2.x-2.11.2675.orig/galerautils/src/gu_log.h
+++ percona-xtradb-cluster-galera-2.x-2.11.2675/galerautils/src/gu_log.h
@@ -70,7 +70,7 @@ extern gu_log_severity_t gu_log_max_leve
#if !defined(__cplusplus) || defined(GALERA_LOG_H_ENABLE_CXX)
// NOTE: don't add "\n" here even if you really want to do it
#define GU_LOG_C(level, ...)\
- gu_log(level, __FILE__, __PRETTY_FUNCTION__, __LINE__,\
+ gu_log(level, __FILE__, __func__, __LINE__,\
## __VA_ARGS__, NULL)
/**
--- percona-xtradb-cluster-galera-2.x-2.11.2675.orig/gcache/src/pasture/Logger.hpp
+++ percona-xtradb-cluster-galera-2.x-2.11.2675/gcache/src/pasture/Logger.hpp
@@ -89,7 +89,7 @@ namespace gcache
#define LOG(level) \
if (Logger::no_log(level)) ; \
- else Logger().get(level, __FILE__, __PRETTY_FUNCTION__, __LINE__)
+ else Logger().get(level, __FILE__, __func__, __LINE__)
#define log_fatal LOG(LOG_FATAL)
#define log_error LOG(LOG_ERROR)
