summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/metrics/TestI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-12-18 14:05:33 +0100
committerJose <jose@zeroc.com>2015-12-18 14:05:33 +0100
commit9ae75237e0784fd302d94b5dd2ec34e42d2c3681 (patch)
tree7e0a96821ce32d734ce3cf39e1d9f8ab5435bbd1 /cpp/test/Ice/metrics/TestI.cpp
parentDisable running C++11 travis tests (diff)
downloadice-9ae75237e0784fd302d94b5dd2ec34e42d2c3681.tar.bz2
ice-9ae75237e0784fd302d94b5dd2ec34e42d2c3681.tar.xz
ice-9ae75237e0784fd302d94b5dd2ec34e42d2c3681.zip
C++11 background & metrics test fixes
Diffstat (limited to 'cpp/test/Ice/metrics/TestI.cpp')
-rw-r--r--cpp/test/Ice/metrics/TestI.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/metrics/TestI.cpp b/cpp/test/Ice/metrics/TestI.cpp
index 5ccc6b8ab23..9025f4187bf 100644
--- a/cpp/test/Ice/metrics/TestI.cpp
+++ b/cpp/test/Ice/metrics/TestI.cpp
@@ -46,11 +46,11 @@ MetricsI::opWithUnknownException(const Ice::Current&)
}
void
-MetricsI::opByteS(const Test::ByteSeq&, const Ice::Current&)
+MetricsI::opByteS(ICE_IN(Test::ByteSeq), const Ice::Current&)
{
}
-Ice::ObjectPrx
+Ice::ObjectPrxPtr
MetricsI::getAdmin(const Ice::Current& current)
{
return current.adapter->getCommunicator()->getAdmin();