summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2005-04-25 11:39:33 +0000
committerDwayne Boone <dwayne@zeroc.com>2005-04-25 11:39:33 +0000
commitba75aa39dbf29eba02941fad2b4ac5c7d4b30a13 (patch)
treedc589a20f0160269661ee5e6669f894bd3c9add6 /cpp/src/IceUtil
parentchanging IceUtil.Assert.Assert to IceUtil.Assert.FinalizerAssert (diff)
downloadice-ba75aa39dbf29eba02941fad2b4ac5c7d4b30a13.tar.bz2
ice-ba75aa39dbf29eba02941fad2b4ac5c7d4b30a13.tar.xz
ice-ba75aa39dbf29eba02941fad2b4ac5c7d4b30a13.zip
Fixed ice_name return type
Diffstat (limited to 'cpp/src/IceUtil')
-rw-r--r--cpp/src/IceUtil/CtrlCHandler.cpp2
-rw-r--r--cpp/src/IceUtil/Exception.cpp4
-rw-r--r--cpp/src/IceUtil/ThreadException.cpp8
-rw-r--r--cpp/src/IceUtil/UUID.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index c738f915876..e6347d5eef9 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -31,7 +31,7 @@ CtrlCHandlerException::CtrlCHandlerException(const char* file, int line) :
static const char* ctrlCHandlerName = "IceUtil::CtrlCHandlerException";
-const char*
+const string
CtrlCHandlerException::ice_name() const
{
return ctrlCHandlerName;
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp
index 12bbe20059c..038bf203a14 100644
--- a/cpp/src/IceUtil/Exception.cpp
+++ b/cpp/src/IceUtil/Exception.cpp
@@ -36,7 +36,7 @@ IceUtil::Exception::~Exception()
const char* IceUtil::Exception::_name = "IceUtil::Exception";
-const char*
+const string
IceUtil::Exception::ice_name() const
{
return _name;
@@ -94,7 +94,7 @@ IceUtil::NullHandleException::NullHandleException(const char* file, int line) :
const char* IceUtil::NullHandleException::_name = "IceUtil::NullHandleException";
-const char*
+const string
IceUtil::NullHandleException::ice_name() const
{
return _name;
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index eb6a96f19b3..abaa79f26a6 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -19,7 +19,7 @@ IceUtil::ThreadSyscallException::ThreadSyscallException(const char* file, int li
const char* IceUtil::ThreadSyscallException::_name = "IceUtil::ThreadSyscallException";
-const char*
+const string
IceUtil::ThreadSyscallException::ice_name() const
{
return _name;
@@ -87,7 +87,7 @@ IceUtil::ThreadLockedException::ThreadLockedException(const char* file, int line
const char* IceUtil::ThreadLockedException::_name = "IceUtil::ThreadLockedException";
-const char*
+const string
IceUtil::ThreadLockedException::ice_name() const
{
return _name;
@@ -112,7 +112,7 @@ IceUtil::ThreadStartedException::ThreadStartedException(const char* file, int li
const char* IceUtil::ThreadStartedException::_name = "IceUtil::ThreadStartedException";
-const char*
+const string
IceUtil::ThreadStartedException::ice_name() const
{
return _name;
@@ -137,7 +137,7 @@ IceUtil::ThreadNotStartedException::ThreadNotStartedException(const char* file,
const char* IceUtil::ThreadNotStartedException::_name = "IceUtil::ThreadNotStartedException";
-const char*
+const string
IceUtil::ThreadNotStartedException::ice_name() const
{
return _name;
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 430a82ffc01..963215ae888 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -99,7 +99,7 @@ static UUIDCleanup uuidCleanup;
#endif
-const char*
+const string
IceUtil::UUIDGenerationException::ice_name() const
{
return _name;