diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-10-31 15:54:21 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-10-31 15:54:21 -0400 |
| commit | 107e03ea13e0eba9c33f120f0d95ac9fefc7dcad (patch) | |
| tree | 00191b7ccb83fe436ad61bdbb43b523f431c6698 /cpp/src/Slice/JavaUtil.cpp | |
| parent | Update 3.7 changelog (diff) | |
| download | ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.tar.bz2 ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.tar.xz ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.zip | |
Replaced slice compiler options --ice, --underscore and --dll-export by
global metadata directives (ice-prefix, underscore, cpp:dll-export:SYMBOL and objc:dll-export:SYMBOL)
Added new cs:tie and java:tie metadata
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index ad8d3628d65..0a20815d592 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -164,10 +164,15 @@ public: bool ok = false; static const string packagePrefix = "java:package:"; + static const string checksumPrefix = "java:checksum:"; if(s.find(packagePrefix) == 0 && s.size() > packagePrefix.size()) { ok = true; } + else if(s.find(checksumPrefix) == 0 && s.size() > checksumPrefix.size()) + { + ok = true; + } if(!ok) { @@ -369,12 +374,18 @@ private: if(rest == "getset") { result.push_back(s); + continue; } else if(rest == "buffer") { result.push_back(s); + continue; + } + else if(rest == "tie") + { + result.push_back(s); + continue; } - continue; } } else if(s.substr(prefix.size(), pos - prefix.size()) == "type") |