summaryrefslogtreecommitdiff
path: root/cpp/test/include
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/test/include
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/test/include')
-rw-r--r--cpp/test/include/TestCommon.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h
index 322672478ac..cad96b6bc41 100644
--- a/cpp/test/include/TestCommon.h
+++ b/cpp/test/include/TestCommon.h
@@ -144,19 +144,21 @@ public:
{
}
- virtual ~TestFailedException() throw()
+ virtual ~TestFailedException() ICE_NOEXCEPT
{
}
- virtual ::std::string ice_name() const
+ virtual ::std::string ice_id() const
{
return "::TestFailedException";
}
+#ifndef ICE_CPP11_MAPPING
virtual TestFailedException* ice_clone() const
{
return new TestFailedException(*this);
}
+#endif
virtual void ice_throw() const
{