[XRay][tools] Fixup for pedantic and permissive errors/warnings

Remove extraneous semicolons and fully qualify the Trace type.

Follow-up to D29320.

llvm-svn: 301161

diff --git a/llvm/tools/llvm-xray/xray-graph-diff.h b/llvm/tools/llvm-xray/xray-graph-diff.h
index 7a21cce..5abec91 100644 (file)
--- a/llvm/tools/llvm-xray/xray-graph-diff.h
+++ b/llvm/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/llvm/tools/llvm-xray/xray-graph.h b/llvm/tools/llvm-xray/xray-graph.h
index 81c2e0e..3636287 100644 (file)
--- a/llvm/tools/llvm-xray/xray-graph.h
+++ b/llvm/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();
   };