summaryrefslogtreecommitdiff
path: root/cpp/include
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include')
-rw-r--r--cpp/include/Ice/Exception.h4
-rw-r--r--cpp/include/IceUtil/CtrlCHandler.h2
-rw-r--r--cpp/include/IceUtil/Exception.h8
-rw-r--r--cpp/include/IceUtil/ThreadException.h16
-rw-r--r--cpp/include/IceUtil/UUID.h4
-rw-r--r--cpp/include/IceXML/Parser.h4
6 files changed, 19 insertions, 19 deletions
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index 256e1ac99b2..1acf9269c1e 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -31,7 +31,7 @@ class ICE_API LocalException : public IceUtil::Exception
public:
LocalException(const char*, int);
- virtual const std::string& ice_name() const = 0;
+ virtual const char* ice_name() const = 0;
virtual Exception* ice_clone() const = 0;
virtual void ice_throw() const = 0;
};
@@ -40,7 +40,7 @@ class ICE_API UserException : public IceUtil::Exception
{
public:
- virtual const std::string& ice_name() const = 0;
+ virtual const char* ice_name() const = 0;
virtual Exception* ice_clone() const = 0;
virtual void ice_throw() const = 0;
diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h
index 18504efd3be..527f3800e25 100644
--- a/cpp/include/IceUtil/CtrlCHandler.h
+++ b/cpp/include/IceUtil/CtrlCHandler.h
@@ -61,7 +61,7 @@ class ICE_UTIL_API CtrlCHandlerException : public Exception
public:
CtrlCHandlerException(const char*, int);
- virtual const std::string& ice_name() const;
+ virtual const char* ice_name() const;
virtual Exception* ice_clone() const;
virtual void ice_throw() const;
};
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index b19316a464b..961a6f144d8 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.h
@@ -22,7 +22,7 @@ public:
Exception();
Exception(const char*, int);
virtual ~Exception();
- virtual const std::string& ice_name() const;
+ virtual const char* ice_name() const;
virtual void ice_print(std::ostream&) const;
virtual Exception* ice_clone() const;
virtual void ice_throw() const;
@@ -33,7 +33,7 @@ private:
const char* _file;
int _line;
- static ::std::string _name;
+ static const char* _name;
};
ICE_UTIL_API std::ostream& operator<<(std::ostream&, const Exception&);
@@ -43,13 +43,13 @@ class ICE_UTIL_API NullHandleException : public Exception
public:
NullHandleException(const char*, int);
- virtual const std::string& ice_name() const;
+ virtual const char* ice_name() const;
virtual Exception* ice_clone() const;
virtual void ice_throw() const;
private:
- static ::std::string _name;
+ static const char* _name;
};
}
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h
index d1fbcecc61e..cc477754531 100644
--- a/cpp/include/IceUtil/ThreadException.h
+++ b/cpp/include/IceUtil/ThreadException.h
@@ -20,7 +20,7 @@ class ICE_UTIL_API ThreadSyscallException : public Exception
public:
ThreadSyscallException(const char*, int, int);
- virtual const std::string& ice_name() const;
+ virtual const char* ice_name() const;
virtual void ice_print(std::ostream&) const;
virtual Exception* ice_clone() const;
virtual void ice_throw() const;
@@ -29,7 +29,7 @@ public:
private:
const int _error;
- static ::std::string _name;
+ static const char* _name;
};
class ICE_UTIL_API ThreadLockedException : public Exception
@@ -37,13 +37,13 @@ class ICE_UTIL_API ThreadLockedException : public Exception
public:
ThreadLockedException(const char*, int);
- virtual const std::string& ice_name() const;
+ virtual const char* ice_name() const;
virtual Exception* ice_clone() const;
virtual void ice_throw() const;
private:
- static ::std::string _name;
+ static const char* _name;
};
class ICE_UTIL_API ThreadStartedException : public Exception
@@ -51,13 +51,13 @@ class ICE_UTIL_API ThreadStartedException : public Exception
public:
ThreadStartedException(const char*, int);
- virtual const std::string& ice_name() const;
+ virtual const char* ice_name() const;
virtual Exception* ice_clone() const;
virtual void ice_throw() const;
private:
- static ::std::string _name;
+ static const char* _name;
};
class ICE_UTIL_API ThreadNotStartedException : public Exception
@@ -65,13 +65,13 @@ class ICE_UTIL_API ThreadNotStartedException : public Exception
public:
ThreadNotStartedException(const char*, int);
- virtual const std::string& ice_name() const;
+ virtual const char* ice_name() const;
virtual Exception* ice_clone() const;
virtual void ice_throw() const;
private:
- static ::std::string _name;
+ static const char* _name;
};
}
diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h
index aaa57d3912a..6ad57c26616 100644
--- a/cpp/include/IceUtil/UUID.h
+++ b/cpp/include/IceUtil/UUID.h
@@ -21,13 +21,13 @@ class ICE_UTIL_API UUIDGenerationException : public Exception
public:
UUIDGenerationException(const char*, int);
- virtual const std::string& ice_name() const;
+ virtual const char* ice_name() const;
virtual Exception* ice_clone() const;
virtual void ice_throw() const;
private:
- static ::std::string _name;
+ static const char* _name;
};
ICE_UTIL_API std::string generateUUID();
diff --git a/cpp/include/IceXML/Parser.h b/cpp/include/IceXML/Parser.h
index 9f6fd6caefb..18986a30159 100644
--- a/cpp/include/IceXML/Parser.h
+++ b/cpp/include/IceXML/Parser.h
@@ -35,7 +35,7 @@ public:
ParserException(const std::string&);
ParserException(const char*, int, const std::string&);
- virtual const std::string& ice_name() const;
+ virtual const char* ice_name() const;
virtual void ice_print(std::ostream&) const;
virtual IceUtil::Exception* ice_clone() const;
virtual void ice_throw() const;
@@ -45,7 +45,7 @@ public:
private:
std::string _reason;
- static std::string _name;
+ static const char* _name;
};
class Node;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:01:23 +0000