From b35bb38f18fd94aa67af944f76b820d59380b78b Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 7 Nov 2017 11:50:47 +0100
Subject: Clean away temporarily added using declarations

Change-Id: I26734c13515394162d88351a1cbe2b20abdac865
---
 compilerplugins/clang/inlinefields.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'compilerplugins/clang/inlinefields.cxx')

diff --git a/compilerplugins/clang/inlinefields.cxx b/compilerplugins/clang/inlinefields.cxx
index 42551dc61660..490d40818683 100644
--- a/compilerplugins/clang/inlinefields.cxx
+++ b/compilerplugins/clang/inlinefields.cxx
@@ -65,7 +65,8 @@ class InlineFields:
     public RecursiveASTVisitor<InlineFields>, public loplugin::Plugin
 {
 public:
-    explicit InlineFields(InstantiationData const & data): Plugin(data) {}
+    explicit InlineFields(loplugin::InstantiationData const & data):
+        Plugin(data) {}
 
     virtual void run() override
     {
@@ -120,7 +121,7 @@ MyFieldInfo InlineFields::niceName(const FieldDecl* fieldDecl)
     SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( fieldDecl->getLocation() );
     StringRef name = compiler.getSourceManager().getFilename(expansionLoc);
     aInfo.sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
-    normalizeDotDotInFilePath(aInfo.sourceLocation);
+    loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation);
 
     return aInfo;
 }
-- 
cgit