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

[Dean Michael Berris via llvm-commits]

Author: dberris
Date: Mon Apr 24 01:15:53 2017
New Revision: 301161

URL: http://llvm.org/viewvc/llvm-project?rev=301161&view=rev
Log:
[XRay][tools] Fixup for pedantic and permissive errors/warnings

Remove extraneous semicolons and fully qualify the Trace type.

Follow-up to D29320.

Modified:
    llvm/trunk/tools/llvm-xray/xray-graph-diff.h
    llvm/trunk/tools/llvm-xray/xray-graph.h

Modified: llvm/trunk/tools/llvm-xray/xray-graph-diff.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-xray/xray-graph-diff.h?rev=301161&r1=301160&r2=301161&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-xray/xray-graph-diff.h (original)
+++ llvm/trunk/tools/llvm-xray/xray-graph-diff.h Mon Apr 24 01:15:53 2017
@@ -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

Modified: llvm/trunk/tools/llvm-xray/xray-graph.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-xray/xray-graph.h?rev=301161&r1=301160&r2=301161&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-xray/xray-graph.h (original)
+++ llvm/trunk/tools/llvm-xray/xray-graph.h Mon Apr 24 01:15:53 2017
@@ -149,7 +149,7 @@ public:
     bool KeepGoing;
     bool DeduceSiblingCalls;
     std::string InstrMap;
-    Trace Trace;
+    ::llvm::xray::Trace Trace;
     Expected<GraphRenderer> getGraphRenderer();
   };