1 files changed, 47 insertions, 0 deletions
diff --git a/cppe/src/IceE/LocalException.cpp b/cppe/src/IceE/LocalException.cpp
index 9ac86e7e8dd..70e45d61f3e 100755
--- a/cppe/src/IceE/LocalException.cpp
+++ b/cppe/src/IceE/LocalException.cpp
@@ -1691,6 +1691,45 @@ Ice::MemoryLimitException::ice_throw() const
     throw *this;
 }
 
+
+Ice::StringConversionException::StringConversionException(const char* __file, int __line) :
+#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
+    MarshalException(__file, __line)
+#else
+    ::Ice::MarshalException(__file, __line)
+#endif
+{
+}
+
+Ice::StringConversionException::StringConversionException(const char* __file, int __line, const ::std::string& __reason) :
+#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
+    MarshalException(__file, __line, __reason)
+#else
+    ::Ice::MarshalException(__file, __line, __reason)
+#endif
+{
+}
+
+static const char* __Ice__StringConversionException_name = "Ice::StringConversionException";
+
+const ::std::string
+Ice::StringConversionException::ice_name() const
+{
+    return __Ice__StringConversionException_name;
+}
+
+::Ice::Exception*
+Ice::StringConversionException::ice_clone() const
+{
+    return new StringConversionException(*this);
+}
+
+void
+Ice::StringConversionException::ice_throw() const
+{
+    throw *this;
+}
+
 Ice::EncapsulationException::EncapsulationException(const char* __file, int __line) :
 #if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
     MarshalException(__file, __line)
@@ -2186,6 +2225,14 @@ Ice::MemoryLimitException::toString() const
 }
 
 string
+Ice::StringConversionException::toString() const
+{
+    string out = Exception::toString();
+    out += ":\nprotocol error: string conversion failed";
+    return out;
+}
+
+string
 Ice::EncapsulationException::toString() const
 {
     string out = Exception::toString();