diff options
author | Joe George <joe@zeroc.com> | 2016-06-29 11:16:14 -0400 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2016-06-29 11:26:52 -0400 |
commit | 9d5e62c9d1c721b4fc116a5108c81162d2df8c9d (patch) | |
tree | 75b9b27e786bb64c3ffbc1fe0565dda531af2d54 /cpp/src/slice2java/Gen.cpp | |
parent | Reduced number of symbols exported by generated code with MSVC (diff) | |
download | ice-9d5e62c9d1c721b4fc116a5108c81162d2df8c9d.tar.bz2 ice-9d5e62c9d1c721b4fc116a5108c81162d2df8c9d.tar.xz ice-9d5e62c9d1c721b4fc116a5108c81162d2df8c9d.zip |
Whitespace cleanup - tabs to spaces
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
-rw-r--r-- | cpp/src/slice2java/Gen.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 14d6acad2a0..3e526d761ff 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -40,7 +40,7 @@ void writeU8Buffer(const vector<unsigned char>& u8buffer, ::IceUtilInternal::Output& out) { vector<unsigned short> u16buffer = toUTF16(u8buffer); - + for(vector<unsigned short>::const_iterator c = u16buffer.begin(); c != u16buffer.end(); ++c) { out << u16CodePoint(*c); @@ -2979,7 +2979,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) out << "class " << fixKwd(name); out.useCurrentPosAsIndent(); - StringList implements; + StringList implements; bool implementsOnNewLine = true; if(bases.empty() || bases.front()->isInterface()) @@ -2987,7 +2987,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) if(p->isLocal()) { implementsOnNewLine = false; - implements.push_back("java.lang.Cloneable"); + implements.push_back("java.lang.Cloneable"); } else { @@ -3343,28 +3343,28 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p) if(!p->isInterface()) { - out << sp << nl << "public " << name << nl << "clone()"; - out << sb; - - if(p->isLocal() && !baseClass) - { - out << nl << name << " c = null;"; - out << nl << "try"; - out << sb; - out << nl << "c = (" << name << ")super.clone();"; - out << eb; - out << nl << "catch(CloneNotSupportedException ex)"; - out << sb; - out << nl << "assert false; // impossible"; - out << eb; - out << nl << "return c;"; - - } - else - { - out << nl << "return (" << name << ")super.clone();"; - } - out << eb; + out << sp << nl << "public " << name << nl << "clone()"; + out << sb; + + if(p->isLocal() && !baseClass) + { + out << nl << name << " c = null;"; + out << nl << "try"; + out << sb; + out << nl << "c = (" << name << ")super.clone();"; + out << eb; + out << nl << "catch(CloneNotSupportedException ex)"; + out << sb; + out << nl << "assert false; // impossible"; + out << eb; + out << nl << "return c;"; + + } + else + { + out << nl << "return (" << name << ")super.clone();"; + } + out << eb; } if(p->isInterface() && !p->isLocal()) @@ -3775,7 +3775,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) if(p->usesClasses(false)) { - if(!base || (base && !base->usesClasses(false))) + if(!base || (base && !base->usesClasses(false))) { out << sp << nl << "public boolean" << nl << "__usesClasses()"; out << sb; |