summaryrefslogtreecommitdiff
path: root/cppe/src/IceE/Current.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2008-06-03 19:32:20 -0700
committerMark Spruiell <mes@zeroc.com>2008-06-03 19:32:20 -0700
commit3d649bed4328992f41f567136025f58a019a5159 (patch)
tree470be901fbbfe5c6cd4269884412b0d36b48dc92 /cppe/src/IceE/Current.cpp
parentlocal interface fixes for slice2javae (diff)
downloadice-3d649bed4328992f41f567136025f58a019a5159.tar.bz2
ice-3d649bed4328992f41f567136025f58a019a5159.tar.xz
ice-3d649bed4328992f41f567136025f58a019a5159.zip
Various Ice-E fixes:
- Bug fix in slice2javae for local interfaces/classes - Added Ice.LocalObjectHolder - Reviewed Java/C++ demos and aligned with Ice - Source code clean up (removed tabs, etc.)
Diffstat (limited to 'cppe/src/IceE/Current.cpp')
-rw-r--r--cppe/src/IceE/Current.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/cppe/src/IceE/Current.cpp b/cppe/src/IceE/Current.cpp
index 9b5543f9e39..0ae5348eefb 100644
--- a/cppe/src/IceE/Current.cpp
+++ b/cppe/src/IceE/Current.cpp
@@ -20,35 +20,35 @@ Ice::Current::operator!=(const Current& __rhs) const
{
if(this == &__rhs)
{
- return false;
+ return false;
}
if(adapter != __rhs.adapter)
{
- return true;
+ return true;
}
if(con != __rhs.con)
{
- return true;
+ return true;
}
if(id != __rhs.id)
{
- return true;
+ return true;
}
if(facet != __rhs.facet)
{
- return true;
+ return true;
}
if(operation != __rhs.operation)
{
- return true;
+ return true;
}
if(mode != __rhs.mode)
{
- return true;
+ return true;
}
if(ctx != __rhs.ctx)
{
- return true;
+ return true;
}
return false;
}
@@ -58,63 +58,63 @@ Ice::Current::operator<(const Current& __rhs) const
{
if(this == &__rhs)
{
- return false;
+ return false;
}
if(adapter < __rhs.adapter)
{
- return true;
+ return true;
}
else if(__rhs.adapter < adapter)
{
- return false;
+ return false;
}
if(con < __rhs.con)
{
- return true;
+ return true;
}
else if(__rhs.con < con)
{
- return false;
+ return false;
}
if(id < __rhs.id)
{
- return true;
+ return true;
}
else if(__rhs.id < id)
{
- return false;
+ return false;
}
if(facet < __rhs.facet)
{
- return true;
+ return true;
}
else if(__rhs.facet < facet)
{
- return false;
+ return false;
}
if(operation < __rhs.operation)
{
- return true;
+ return true;
}
else if(__rhs.operation < operation)
{
- return false;
+ return false;
}
if(mode < __rhs.mode)
{
- return true;
+ return true;
}
else if(__rhs.mode < mode)
{
- return false;
+ return false;
}
if(ctx < __rhs.ctx)
{
- return true;
+ return true;
}
else if(__rhs.ctx < ctx)
{
- return false;
+ return false;
}
return false;
}