summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/CtrlCHandler.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-01-20 10:36:51 +0100
committerJose <jose@zeroc.com>2016-01-20 10:36:51 +0100
commit13f4fd6d3cc5a044db66d9c25319419bb4ede5fa (patch)
treec230ae28caba40ac1f939fbedb5fd780d49fad0c /cpp/src/IceUtil/CtrlCHandler.cpp
parentICE-6861 - removing public stream API (diff)
downloadice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.bz2
ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.xz
ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.zip
ice_name/ice_id fixes & simplifications.
Diffstat (limited to 'cpp/src/IceUtil/CtrlCHandler.cpp')
-rw-r--r--cpp/src/IceUtil/CtrlCHandler.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index f21281f8a0d..3e0633172d6 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -55,24 +55,19 @@ CtrlCHandlerException::CtrlCHandlerException(const char* file, int line) :
{
}
-namespace
-{
-
-const char* ctrlCHandlerName = "IceUtil::CtrlCHandlerException";
-
-}
-
string
-CtrlCHandlerException::ice_name() const
+CtrlCHandlerException::ice_id() const
{
- return ctrlCHandlerName;
+ return "::IceUtil::CtrlCHandlerException";
}
+#ifndef ICE_CPP11_MAPPING
CtrlCHandlerException*
CtrlCHandlerException::ice_clone() const
{
return new CtrlCHandlerException(*this);
}
+#endif
void
CtrlCHandlerException::ice_throw() const