From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH 2/5] KernelShark: Fix compilation issues on Fedora 32
Date: Mon, 27 Jul 2020 10:18:20 +0300 [thread overview]
Message-ID: <20200727071823.169962-3-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20200727071823.169962-1-tz.stoyanov@gmail.com>
From: Tzvetomir (VMware) Stoyanov <tz.stoyanov@gmail.com>
Included <string.h> to fix this compilation error:
"error: ‘string’ in namespace ‘std’ does not name a type"
Converted fontHeight and stringWidth to inline to fix these
compilation errors:
"multiple definition of `fontHeight';"
"multiple definition of `stringWidth';"
Signed-off-by: Tzvetomir (VMware) Stoyanov <tz.stoyanov@gmail.com>
---
src/KsPlotTools.cpp | 1 +
src/KsPlotTools.hpp | 1 +
src/KsUtils.hpp | 4 ++--
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/KsPlotTools.cpp b/src/KsPlotTools.cpp
index 17db451..7dcd4f2 100644
--- a/src/KsPlotTools.cpp
+++ b/src/KsPlotTools.cpp
@@ -12,6 +12,7 @@
// C
#include <math.h>
#include <cstring>
+#include <string>
// C++
#include <algorithm>
diff --git a/src/KsPlotTools.hpp b/src/KsPlotTools.hpp
index 75fb4da..c66fea3 100644
--- a/src/KsPlotTools.hpp
+++ b/src/KsPlotTools.hpp
@@ -14,6 +14,7 @@
// C
#include <math.h>
+#include <string>
// C++
#include <limits>
diff --git a/src/KsUtils.hpp b/src/KsUtils.hpp
index cfb45f4..5857099 100644
--- a/src/KsUtils.hpp
+++ b/src/KsUtils.hpp
@@ -36,7 +36,7 @@
//! @cond Doxygen_Suppress
-auto fontHeight = []()
+inline auto fontHeight = []()
{
QFont font;
QFontMetrics fm(font);
@@ -44,7 +44,7 @@ auto fontHeight = []()
return fm.height();
};
-auto stringWidth = [](QString s)
+inline auto stringWidth = [](QString s)
{
QFont font;
QFontMetrics fm(font);
--
2.26.2
next prev parent reply other threads:[~2020-07-27 7:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 7:18 [PATCH 0/5] Add support for opening trace.dat files with multuiple buffers Tzvetomir Stoyanov (VMware)
2020-07-27 7:18 ` [PATCH 1/5] KernelShark: Add stream name Tzvetomir Stoyanov (VMware)
2020-07-28 13:21 ` Steven Rostedt
2020-07-27 7:18 ` Tzvetomir Stoyanov (VMware) [this message]
2020-07-28 13:23 ` [PATCH 2/5] KernelShark: Fix compilation issues on Fedora 32 Steven Rostedt
2020-07-27 7:18 ` [PATCH 3/5] KernelShark: Fix combo plot plugin crash in case of multiple streams Tzvetomir Stoyanov (VMware)
2020-07-28 13:26 ` Steven Rostedt
2020-07-27 7:18 ` [PATCH 4/5] KernelShark: Load trace.dat file with ftrace sub-buffers Tzvetomir Stoyanov (VMware)
2020-07-27 7:18 ` [PATCH 5/5] KernelShark: New libkshark API for loading all entries from given file Tzvetomir Stoyanov (VMware)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200727071823.169962-3-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).