diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-10-18 12:01:54 -0400 |
|---|---|---|
| committer | Jose <pepone@users.noreply.github.com> | 2018-10-18 18:01:53 +0200 |
| commit | 456001e3e4dbb3f15396c0598b6ddb5436ac3a2a (patch) | |
| tree | facb9db494f91b066a1c0b5e29c371ec523a82e7 /cpp/src/slice2cs/CsUtil.h | |
| parent | Update Xamarin test instructions (diff) | |
| download | ice-456001e3e4dbb3f15396c0598b6ddb5436ac3a2a.tar.bz2 ice-456001e3e4dbb3f15396c0598b6ddb5436ac3a2a.tar.xz ice-456001e3e4dbb3f15396c0598b6ddb5436ac3a2a.zip | |
Rework cs:namespace implementation (fix issue #239) (#249)
* Rework the cs:namespace implementation
No longer rely on Ice.Packages. Fixes #239.
* Renamed Ice/packagemd to Ice/namespacemd (C#)
* Removed Ice.Package property from C# tests
* Switched to get-only attribute, fixed Xamarin test
Diffstat (limited to 'cpp/src/slice2cs/CsUtil.h')
| -rw-r--r-- | cpp/src/slice2cs/CsUtil.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/slice2cs/CsUtil.h b/cpp/src/slice2cs/CsUtil.h index 3c842d73f43..861ecedb9d8 100644 --- a/cpp/src/slice2cs/CsUtil.h +++ b/cpp/src/slice2cs/CsUtil.h @@ -35,7 +35,7 @@ public: // // Returns the namespace of a Contained entity. // - static std::string getPackage(const ContainedPtr&); + static std::string getNamespace(const ContainedPtr&); static std::string getUnqualified(const std::string&, const std::string&, bool builtin = false); static std::string getUnqualified(const ContainedPtr&, @@ -48,7 +48,8 @@ protected: // // Returns the namespace prefix of a Contained entity. // - static std::string getPackagePrefix(const ContainedPtr&); + static std::string getNamespacePrefix(const ContainedPtr&); + static std::string getCustomTypeIdNamespace(const UnitPtr&); static std::string resultStructName(const std::string&, const std::string&, bool = false); static std::string resultType(const OperationPtr&, const std::string&, bool = false); |