summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/stringConverter/Client.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-12-07 21:08:51 +0100
committerJose <jose@zeroc.com>2015-12-07 21:08:51 +0100
commitacb6c5333de462e29d21166057fc074a815f2e3d (patch)
tree9acad37c34ef7b503f3aac13ea1858f1c965946c /cpp/test/Ice/stringConverter/Client.cpp
parentICE-6897 - Add delegate metadata (diff)
downloadice-acb6c5333de462e29d21166057fc074a815f2e3d.tar.bz2
ice-acb6c5333de462e29d21166057fc074a815f2e3d.tar.xz
ice-acb6c5333de462e29d21166057fc074a815f2e3d.zip
C++11 mapping updates:
- Added missing __hash method - Added missing virtual method Value::ice_clone - Fixed issue with unmarshalling the idirection table - Fixed default value initialization for scoped enums - Fixed scoped enums mapping to use correct size types - Added missing ice_id method to generated Value classes - Fixed defaultValue, hash, networkProxy, plug-in, stringConverter, threadPoolPriority and slicing/objects tests to work with C++11 mapping
Diffstat (limited to 'cpp/test/Ice/stringConverter/Client.cpp')
-rw-r--r--cpp/test/Ice/stringConverter/Client.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp
index 6ec547fc496..e1e57d2e7ae 100644
--- a/cpp/test/Ice/stringConverter/Client.cpp
+++ b/cpp/test/Ice/stringConverter/Client.cpp
@@ -41,9 +41,7 @@ main(int argc, char* argv[])
// (we just used the codeset for as default internal code for
// stringConverter below)
//
-
- useLocale = (setlocale(LC_ALL, "fr_FR.ISO8859-15") != 0
- || setlocale(LC_ALL, "fr_FR.iso885915@euro") != 0);
+ useLocale = (setlocale(LC_ALL, "fr_FR.ISO8859-15") != 0 || setlocale(LC_ALL, "fr_FR.iso885915@euro") != 0);
#endif
#if defined(_WIN32)
@@ -97,8 +95,8 @@ main(int argc, char* argv[])
int
Client::run(int, char*[])
{
- Test::MyObjectPrx proxy =
- Test::MyObjectPrx::uncheckedCast(communicator()->stringToProxy("test:default -p 12010"));
+ Test::MyObjectPrxPtr proxy = ICE_UNCHECKED_CAST(Test::MyObjectPrx,
+ communicator()->stringToProxy("test:default -p 12010"));
char oe = char(0xBD); // A single character in ISO Latin 9
string msg = string("tu me fends le c") + oe + "ur!";