From 26452aaa7f31129a3c1889fee669eedda00cad75 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 19 Jun 2018 14:16:11 +0200 Subject: slice2cpp generates invalid code wrt namespace qualification Closes #104 --- cpp/src/Slice/JavaUtil.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cpp/src/Slice/JavaUtil.h') diff --git a/cpp/src/Slice/JavaUtil.h b/cpp/src/Slice/JavaUtil.h index 9cb32861a48..b55feaabbaa 100644 --- a/cpp/src/Slice/JavaUtil.h +++ b/cpp/src/Slice/JavaUtil.h @@ -107,13 +107,13 @@ protected: // std::string getPackage(const ContainedPtr&) const; - std::string getAbsolute(const std::string&, const std::string&) const; + std::string getUnqualified(const std::string&, const std::string&) const; // // Returns the Java name for a Contained entity. If the optional // package argument matches the entity's package name, then the // package is removed from the result. // - std::string getAbsolute(const ContainedPtr&, + std::string getUnqualified(const ContainedPtr&, const std::string& = std::string(), const std::string& = std::string(), const std::string& = std::string()) const; @@ -277,14 +277,14 @@ protected: // Returns the Java type without a package if the package // matches the current package // - std::string getAbsolute(const std::string&, const std::string&) const; + std::string getUnqualified(const std::string&, const std::string&) const; // // Returns the Java name for a Contained entity. If the optional // package argument matches the entity's package name, then the // package is removed from the result. // - std::string getAbsolute(const ContainedPtr&, + std::string getUnqualified(const ContainedPtr&, const std::string& = std::string(), const std::string& = std::string(), const std::string& = std::string()) const; -- cgit v1.2.3