diff options
| author | Jose <jose@zeroc.com> | 2018-06-19 14:16:11 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-06-19 14:16:11 +0200 |
| commit | 26452aaa7f31129a3c1889fee669eedda00cad75 (patch) | |
| tree | 3da1350b5a3939ec5e62e30c0e2b8e1a2ce02b79 /cpp/src/Slice/JavaUtil.h | |
| parent | TestHelper pass InitializationData as const reference (diff) | |
| download | ice-26452aaa7f31129a3c1889fee669eedda00cad75.tar.bz2 ice-26452aaa7f31129a3c1889fee669eedda00cad75.tar.xz ice-26452aaa7f31129a3c1889fee669eedda00cad75.zip | |
slice2cpp generates invalid code wrt namespace qualification
Closes #104
Diffstat (limited to 'cpp/src/Slice/JavaUtil.h')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.h | 8 |
1 files changed, 4 insertions, 4 deletions
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; |