diff options
author | Mark Spruiell <mes@zeroc.com> | 2002-07-24 14:17:29 +0000 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2002-07-24 14:17:29 +0000 |
commit | 2658c12e6683277db58ba8b5839a3c978f109cb4 (patch) | |
tree | 6de88b0cb58f5e1fc0d98e8cfc14a2bcf77eb96c /cpp/src/Slice/JavaUtil.cpp | |
parent | Added support for basedir attribute (diff) | |
download | ice-2658c12e6683277db58ba8b5839a3c978f109cb4.tar.bz2 ice-2658c12e6683277db58ba8b5839a3c978f109cb4.tar.xz ice-2658c12e6683277db58ba8b5839a3c978f109cb4.zip |
bug fix in getAbsolute for scope removal - only remove scope if result is
unscoped
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
-rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 43b63f1f56e..4c5779ff07a 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -258,7 +258,8 @@ Slice::JavaGenerator::getAbsolute(const string& scoped, string::size_type fscopeSize = fscope.size(); if(fscoped.compare(0, fscopeSize, fscope) == 0) { - if(fscoped.size() > fscopeSize && fscoped[fscopeSize - 1] == ':') + if(fscoped.size() > fscopeSize && fscoped[fscopeSize - 1] == ':' && + fscoped.find(':', fscopeSize) == string::npos) { start = fscopeSize; } |