Linux-Trace-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Subject: Re: [PATCH 2/5] KernelShark: Fix compilation issues on  Fedora 32
Date: Tue, 28 Jul 2020 09:23:22 -0400
Message-ID: <20200728092322.346d827c@oasis.local.home> (raw)
In-Reply-To: <20200727071823.169962-3-tz.stoyanov@gmail.com>

On Mon, 27 Jul 2020 10:18:20 +0300
"Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote:

> From: Tzvetomir (VMware)  Stoyanov <tz.stoyanov@gmail.com>
> 
> Included <string.h> to fix this compilation error:

s/<string.h>/<string>

>    "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';"
> 

Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

-- Steve

> 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);


  reply index

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 ` [PATCH 2/5] KernelShark: Fix compilation issues on Fedora 32 Tzvetomir Stoyanov (VMware)
2020-07-28 13:23   ` Steven Rostedt [this message]
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=20200728092322.346d827c@oasis.local.home \
    --to=rostedt@goodmis.org \
    --cc=linux-trace-devel@vger.kernel.org \
    --cc=tz.stoyanov@gmail.com \
    /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

Linux-Trace-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-trace-devel/0 linux-trace-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-trace-devel linux-trace-devel/ https://lore.kernel.org/linux-trace-devel \
		linux-trace-devel@vger.kernel.org
	public-inbox-index linux-trace-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-trace-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git