summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java/Gen.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2008-11-05 12:21:24 -0330
committerDwayne Boone <dwayne@zeroc.com>2008-11-05 12:21:24 -0330
commite67bc9d134e2727e1da51729665c672904daf6c0 (patch)
tree784284319746e5e4a807c469c50ed5c8b671193d /cpp/src/slice2java/Gen.cpp
parentMerge branch 'R3_3_branch' (diff)
parentBug 3386 - slice errors with wrong line numbers (diff)
downloadice-e67bc9d134e2727e1da51729665c672904daf6c0.tar.bz2
ice-e67bc9d134e2727e1da51729665c672904daf6c0.tar.xz
ice-e67bc9d134e2727e1da51729665c672904daf6c0.zip
Merge branch 'R3_3_branch'
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
-rw-r--r--cpp/src/slice2java/Gen.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 974d0b6e647..e8f7145afc3 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -2670,7 +2670,7 @@ Slice::Gen::TypesVisitor::visitDataMember(const DataMemberPtr& p)
if(p->hasMetaData(_getSetMetaData) || contained->hasMetaData(_getSetMetaData))
{
string capName = p->name();
- capName[0] = toupper(capName[0]);
+ capName[0] = toupper(static_cast<unsigned char>(capName[0]));
//
// If container is a class, get all of its operations so that we can check for conflicts.
@@ -3057,7 +3057,7 @@ Slice::Gen::TypesVisitor::visitConst(const ConstPtr& p)
const string val = p->value();
for(string::const_iterator c = val.begin(); c != val.end(); ++c)
{
- if(isascii(*c) && isprint(*c))
+ if(isascii(static_cast<unsigned char>(*c)) && isprint(static_cast<unsigned char>(*c)))
{
switch(*c)
{