summaryrefslogtreecommitdiff
path: root/php/src
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 /php/src
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 'php/src')
-rw-r--r--php/src/IcePHP/Types.cpp8
-rw-r--r--php/src/IcePHP/Types.h4
2 files changed, 0 insertions, 12 deletions
diff --git a/php/src/IcePHP/Types.cpp b/php/src/IcePHP/Types.cpp
index 2c1c52417cf..0aa78e4791b 100644
--- a/php/src/IcePHP/Types.cpp
+++ b/php/src/IcePHP/Types.cpp
@@ -3409,14 +3409,6 @@ IcePHP::ExceptionReader::ice_id() const
return _info->id;
}
-#ifndef ICE_CPP11_MAPPING
-string
-IcePHP::ExceptionReader::ice_name() const
-{
- return ice_id();
-}
-#endif
-
IcePHP::ExceptionReader*
IcePHP::ExceptionReader::ice_clone() const
{
diff --git a/php/src/IcePHP/Types.h b/php/src/IcePHP/Types.h
index af0f6c01ab1..c435d6ee313 100644
--- a/php/src/IcePHP/Types.h
+++ b/php/src/IcePHP/Types.h
@@ -598,10 +598,6 @@ public:
~ExceptionReader() throw();
virtual std::string ice_id() const;
-#ifndef ICE_CPP11_MAPPING
- ICE_DEPRECATED_API("ice_name() is deprecated, use ice_id() instead.")
- virtual std::string ice_name() const;
-#endif
virtual ExceptionReader* ice_clone() const;
virtual void ice_throw() const;