summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-10-30 16:03:47 +0100
committerJose <jose@zeroc.com>2014-10-30 16:03:47 +0100
commitda8c267316512436ba19f28fa42510be305093f6 (patch)
tree935f3eefd77e909c847a44883fef38fce4bda48d /cpp/src/slice2java
parentMerge branch 'master' of ssh://git/home/git/ice (diff)
downloadice-da8c267316512436ba19f28fa42510be305093f6.tar.bz2
ice-da8c267316512436ba19f28fa42510be305093f6.tar.xz
ice-da8c267316512436ba19f28fa42510be305093f6.zip
ICE-5804 - Warnings when building with GCC (Eliminate C style casts)
Diffstat (limited to 'cpp/src/slice2java')
-rw-r--r--cpp/src/slice2java/Gen.cpp2
-rw-r--r--cpp/src/slice2java/Main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 8eaccb5650e..261a01a90db 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -2417,7 +2417,7 @@ Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, c
str.fill('0');
for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q)
{
- str << (int)(*q);
+ str << static_cast<int>(*q);
}
out << str.str() << "\");";
}
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index fffbf834946..96784e97d5f 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -110,7 +110,7 @@ compile(int argc, char* argv[])
vector<string>args;
try
{
- args = opts.parse(argc, (const char**)argv);
+ args = opts.parse(argc, const_cast<const char**>(argv));
}
catch(const IceUtilInternal::BadOptException& e)
{