diff options
| author | Jose <jose@zeroc.com> | 2015-12-18 14:05:33 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-18 14:05:33 +0100 |
| commit | 9ae75237e0784fd302d94b5dd2ec34e42d2c3681 (patch) | |
| tree | 7e0a96821ce32d734ce3cf39e1d9f8ab5435bbd1 /cpp/test/Ice/stringConverter/Server.cpp | |
| parent | Disable running C++11 travis tests (diff) | |
| download | ice-9ae75237e0784fd302d94b5dd2ec34e42d2c3681.tar.bz2 ice-9ae75237e0784fd302d94b5dd2ec34e42d2c3681.tar.xz ice-9ae75237e0784fd302d94b5dd2ec34e42d2c3681.zip | |
C++11 background & metrics test fixes
Diffstat (limited to 'cpp/test/Ice/stringConverter/Server.cpp')
| -rw-r--r-- | cpp/test/Ice/stringConverter/Server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/stringConverter/Server.cpp b/cpp/test/Ice/stringConverter/Server.cpp index 0607a4f2d17..3c5ff9f007b 100644 --- a/cpp/test/Ice/stringConverter/Server.cpp +++ b/cpp/test/Ice/stringConverter/Server.cpp @@ -22,7 +22,7 @@ class MyObjectI : public Test::MyObject { public: - virtual wstring widen(const string& msg, const Ice::Current&) + virtual wstring widen(ICE_IN(string) msg, const Ice::Current&) { const Ice::Byte* cmsg = reinterpret_cast<const Ice::Byte*>(msg.c_str()); @@ -35,7 +35,7 @@ public: IceUtil::getProcessWstringConverter()); } - virtual string narrow(const wstring& wmsg, const Ice::Current&) + virtual string narrow(ICE_IN(wstring) wmsg, const Ice::Current&) { return IceUtil::wstringToString(wmsg, IceUtil::getProcessStringConverter(), IceUtil::getProcessWstringConverter()); |