summaryrefslogtreecommitdiff
path: root/cppe/src/IceE/ReferenceFactory.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2007-04-30 15:41:10 +0000
committerBenoit Foucher <benoit@zeroc.com>2007-04-30 15:41:10 +0000
commite9f9e7ad594e3a2a366547617d5e829e99aa3752 (patch)
treea09e1cb4c6ed18e9f45721be8e582173a9bea573 /cppe/src/IceE/ReferenceFactory.cpp
parentREmove VC6 and VC7 (diff)
downloadice-e9f9e7ad594e3a2a366547617d5e829e99aa3752.tar.bz2
ice-e9f9e7ad594e3a2a366547617d5e829e99aa3752.tar.xz
ice-e9f9e7ad594e3a2a366547617d5e829e99aa3752.zip
Bug #2155
Diffstat (limited to 'cppe/src/IceE/ReferenceFactory.cpp')
-rw-r--r--cppe/src/IceE/ReferenceFactory.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp
index 6228974ee66..5edbea40b77 100644
--- a/cppe/src/IceE/ReferenceFactory.cpp
+++ b/cppe/src/IceE/ReferenceFactory.cpp
@@ -580,7 +580,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
{
if(facetPath.size() > 1)
{
- throw ProxyUnmarshalException(__FILE__, __LINE__);
+ throwProxyUnmarshalException(__FILE__, __LINE__);
}
facet.swap(facetPath[0]);
}
@@ -590,7 +590,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
Reference::Mode mode = static_cast<Reference::Mode>(modeAsByte);
if(mode < 0 || mode > Reference::ModeLast)
{
- throw ProxyUnmarshalException(__FILE__, __LINE__);
+ throwProxyUnmarshalException(__FILE__, __LINE__);
}
vector<EndpointPtr> endpoints;
@@ -632,7 +632,8 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
return create(ident, facet, mode, secure, adapterId, locatorInfo);
# endif
#else
- throw ProxyUnmarshalException(__FILE__, __LINE__);
+ throwProxyUnmarshalException(__FILE__, __LINE__);
+ return 0; // Unreachable, fixes compiler warning.
#endif
}
}