From 0d479b00569bd9c2a54555c4bbd2791deb9e6044 Mon Sep 17 00:00:00 2001
From: Dean Michael Berris <dberris@google.com>
Date: Mon, 24 Apr 2017 06:15:53 +0000
Subject: [PATCH] [XRay][tools] Fixup for pedantic and permissive
 errors/warnings

Remove extraneous semicolons and fully qualify the Trace type.

Follow-up to D29320.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@301161 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/llvm-xray/xray-graph-diff.h | 4 ++--
 tools/llvm-xray/xray-graph.h      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/llvm-xray/xray-graph-diff.h b/tools/llvm-xray/xray-graph-diff.h
index 7a21cce483f..5abec91d858 100644
--- a/tools/llvm-xray/xray-graph-diff.h
+++ b/tools/llvm-xray/xray-graph-diff.h
@@ -49,7 +49,7 @@ public:
     std::array<std::reference_wrapper<const GraphRenderer::GraphT>, N> G;
 
   public:
-    template <typename... Ts> Factory(Ts &... Args) : G{{Args...}} {};
+    template <typename... Ts> Factory(Ts &... Args) : G{{Args...}} {}
 
     Expected<GraphDiffRenderer> getGraphDiffRenderer();
   };
@@ -66,7 +66,7 @@ public:
                         StatType VertexColor = StatType::NONE,
                         int TruncLen = 40);
 
-  const GraphT &getGraph() { return G; };
+  const GraphT &getGraph() { return G; }
 };
 } // namespace xray
 } // namespace llvm
diff --git a/tools/llvm-xray/xray-graph.h b/tools/llvm-xray/xray-graph.h
index 81c2e0e3ed4..36362873178 100644
--- a/tools/llvm-xray/xray-graph.h
+++ b/tools/llvm-xray/xray-graph.h
@@ -149,7 +149,7 @@ public:
     bool KeepGoing;
     bool DeduceSiblingCalls;
     std::string InstrMap;
-    Trace Trace;
+    ::llvm::xray::Trace Trace;
     Expected<GraphRenderer> getGraphRenderer();
   };
 
-- 
2.50.1