summaryrefslogtreecommitdiff
path: root/ruby
diff options
context:
space:
mode:
Diffstat (limited to 'ruby')
-rw-r--r--ruby/config/Make.rules4
-rw-r--r--ruby/src/IceRuby/Communicator.cpp6
-rw-r--r--ruby/src/IceRuby/Properties.cpp2
-rw-r--r--ruby/src/IceRuby/Proxy.cpp8
-rw-r--r--ruby/src/IceRuby/Slice.cpp4
-rw-r--r--ruby/src/IceRuby/Types.cpp20
-rw-r--r--ruby/src/IceRuby/Util.cpp23
7 files changed, 29 insertions, 38 deletions
diff --git a/ruby/config/Make.rules b/ruby/config/Make.rules
index 6441a012bb3..44dfd44ff62 100644
--- a/ruby/config/Make.rules
+++ b/ruby/config/Make.rules
@@ -39,6 +39,10 @@ ifeq ($(shell uname),Darwin)
endif
endif
+ifeq ($(os),Linux)
+ cppflags := $(filter-out -Wredundant-decls -Wshadow,$(cppflags))
+endif
+
# Ruby linker flags
ruby_ldflags := $(call ruby-call,$$(LIBRUBYARG))
ruby_libdir := $(call ruby-call,$(if $(findstring MINGW,$(shell uname)),$$(bindir),$$(libdir)))
diff --git a/ruby/src/IceRuby/Communicator.cpp b/ruby/src/IceRuby/Communicator.cpp
index ff658c8ed1a..9a2df07c127 100644
--- a/ruby/src/IceRuby/Communicator.cpp
+++ b/ruby/src/IceRuby/Communicator.cpp
@@ -79,7 +79,7 @@ private:
extern "C"
VALUE
-IceRuby_initialize(int argc, VALUE* argv, VALUE self)
+IceRuby_initialize(int argc, VALUE* argv, VALUE /*self*/)
{
ICE_RUBY_TRY
{
@@ -333,7 +333,7 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE self)
extern "C"
VALUE
-IceRuby_stringToIdentity(VALUE self, VALUE str)
+IceRuby_stringToIdentity(VALUE /*self*/, VALUE str)
{
ICE_RUBY_TRY
{
@@ -347,7 +347,7 @@ IceRuby_stringToIdentity(VALUE self, VALUE str)
extern "C"
VALUE
-IceRuby_identityToString(int argc, VALUE* argv, VALUE self)
+IceRuby_identityToString(int argc, VALUE* argv, VALUE /*self*/)
{
ICE_RUBY_TRY
{
diff --git a/ruby/src/IceRuby/Properties.cpp b/ruby/src/IceRuby/Properties.cpp
index 9035965734b..2eaacd85a76 100644
--- a/ruby/src/IceRuby/Properties.cpp
+++ b/ruby/src/IceRuby/Properties.cpp
@@ -27,7 +27,7 @@ IceRuby_Properties_free(Ice::PropertiesPtr* p)
extern "C"
VALUE
-IceRuby_createProperties(int argc, VALUE* argv, VALUE self)
+IceRuby_createProperties(int argc, VALUE* argv, VALUE /*self*/)
{
ICE_RUBY_TRY
{
diff --git a/ruby/src/IceRuby/Proxy.cpp b/ruby/src/IceRuby/Proxy.cpp
index 856053fe3d0..8206bdb0ab1 100644
--- a/ruby/src/IceRuby/Proxy.cpp
+++ b/ruby/src/IceRuby/Proxy.cpp
@@ -1057,7 +1057,7 @@ checkedCastImpl(const Ice::ObjectPrx& p, const string& id, VALUE facet, VALUE ct
extern "C"
VALUE
-IceRuby_ObjectPrx_checkedCast(int argc, VALUE* args, VALUE self)
+IceRuby_ObjectPrx_checkedCast(int argc, VALUE* args, VALUE /*self*/)
{
//
// ice_checkedCast is called from generated code, therefore we always expect
@@ -1123,7 +1123,7 @@ IceRuby_ObjectPrx_checkedCast(int argc, VALUE* args, VALUE self)
extern "C"
VALUE
-IceRuby_ObjectPrx_uncheckedCast(int argc, VALUE* args, VALUE self)
+IceRuby_ObjectPrx_uncheckedCast(int argc, VALUE* args, VALUE /*self*/)
{
ICE_RUBY_TRY
{
@@ -1249,7 +1249,7 @@ IceRuby_ObjectPrx_ice_uncheckedCast(VALUE self, VALUE obj, VALUE facet)
extern "C"
VALUE
-IceRuby_ObjectPrx_ice_staticId(VALUE self)
+IceRuby_ObjectPrx_ice_staticId(VALUE /*self*/)
{
ICE_RUBY_TRY
{
@@ -1261,7 +1261,7 @@ IceRuby_ObjectPrx_ice_staticId(VALUE self)
extern "C"
VALUE
-IceRuby_ObjectPrx_new(int /*argc*/, VALUE* /*args*/, VALUE self)
+IceRuby_ObjectPrx_new(int /*argc*/, VALUE* /*args*/, VALUE /*self*/)
{
ICE_RUBY_TRY
{
diff --git a/ruby/src/IceRuby/Slice.cpp b/ruby/src/IceRuby/Slice.cpp
index 679b040291c..204b81c7197 100644
--- a/ruby/src/IceRuby/Slice.cpp
+++ b/ruby/src/IceRuby/Slice.cpp
@@ -21,7 +21,7 @@ using namespace Slice::Ruby;
extern "C"
VALUE
-IceRuby_loadSlice(int argc, VALUE* argv, VALUE self)
+IceRuby_loadSlice(int argc, VALUE* argv, VALUE /*self*/)
{
ICE_RUBY_TRY
{
@@ -163,7 +163,7 @@ IceRuby_loadSlice(int argc, VALUE* argv, VALUE self)
extern "C"
VALUE
-IceRuby_compile(int argc, VALUE* argv, VALUE self)
+IceRuby_compile(int argc, VALUE* argv, VALUE /*self*/)
{
ICE_RUBY_TRY
{
diff --git a/ruby/src/IceRuby/Types.cpp b/ruby/src/IceRuby/Types.cpp
index b5632c9b22f..17e16c3a454 100644
--- a/ruby/src/IceRuby/Types.cpp
+++ b/ruby/src/IceRuby/Types.cpp
@@ -370,15 +370,15 @@ IceRuby::StreamUtil::getSlicedDataMember(VALUE obj, ObjectMap* objectMap)
Ice::ObjectPtr writer;
- ObjectMap::iterator i = objectMap->find(o);
- if(i == objectMap->end())
+ ObjectMap::iterator k = objectMap->find(o);
+ if(k == objectMap->end())
{
writer = new ObjectWriter(o, objectMap, 0);
objectMap->insert(ObjectMap::value_type(o, writer));
}
else
{
- writer = i->second;
+ writer = k->second;
}
info->instances.push_back(writer);
@@ -1157,8 +1157,8 @@ IceRuby::SequenceInfo::validate(VALUE val)
return true;
}
}
- ID id = rb_intern("to_ary");
- return callRuby(rb_respond_to, val, id) != 0;
+ ID rbid = rb_intern("to_ary");
+ return callRuby(rb_respond_to, val, rbid) != 0;
}
bool
@@ -1705,8 +1705,8 @@ IceRuby::DictionaryInfo::validate(VALUE val)
{
return true;
}
- ID id = rb_intern("to_hash");
- return callRuby(rb_respond_to, val, id) != 0;
+ ID rbid = rb_intern("to_hash");
+ return callRuby(rb_respond_to, val, rbid) != 0;
}
bool
@@ -3174,17 +3174,17 @@ IceRuby_stringify(VALUE /*self*/, VALUE obj, VALUE type)
extern "C"
VALUE
-IceRuby_stringifyException(VALUE /*self*/, VALUE ex)
+IceRuby_stringifyException(VALUE /*self*/, VALUE exc)
{
ICE_RUBY_TRY
{
- volatile VALUE cls = CLASS_OF(ex);
+ volatile VALUE cls = CLASS_OF(exc);
volatile VALUE type = callRuby(rb_const_get, cls, rb_intern("ICE_TYPE"));
ExceptionInfoPtr info = getException(type);
ostringstream ostr;
IceUtilInternal::Output out(ostr);
- info->print(ex, out);
+ info->print(exc, out);
string str = ostr.str();
return createString(str);
diff --git a/ruby/src/IceRuby/Util.cpp b/ruby/src/IceRuby/Util.cpp
index 1e042914306..dc151808771 100644
--- a/ruby/src/IceRuby/Util.cpp
+++ b/ruby/src/IceRuby/Util.cpp
@@ -22,22 +22,10 @@ using namespace IceRuby;
namespace
{
-#ifndef NDEBUG
-bool
-checkIsInstance(VALUE p, const char* type)
-{
- volatile VALUE rbType = callRuby(rb_path2class, type);
- assert(!NIL_P(rbType));
- return callRuby(rb_obj_is_instance_of, p, rbType) == Qtrue;
-}
-#endif
-
template<typename T>
bool
-setVersion(VALUE p, const T& version, const char* type)
+setVersion(VALUE p, const T& version)
{
- assert(checkIsInstance(p, type));
-
volatile VALUE major = callRuby(rb_int2inum, version.major);
volatile VALUE minor = callRuby(rb_int2inum, version.minor);
rb_ivar_set(p, rb_intern("@major"), major);
@@ -48,9 +36,8 @@ setVersion(VALUE p, const T& version, const char* type)
template<typename T>
bool
-getVersion(VALUE p, T& v, const char* type)
+getVersion(VALUE p, T& v)
{
- assert(checkIsInstance(p, type));
volatile VALUE major = callRuby(rb_ivar_get, p, rb_intern("@major"));
volatile VALUE minor = callRuby(rb_ivar_get, p, rb_intern("@minor"));
@@ -84,7 +71,7 @@ createVersion(const T& version, const char* type)
volatile VALUE obj = callRuby(rb_class_new_instance, 0, static_cast<VALUE*>(0), rbType);
- if(!setVersion<T>(obj, version, type))
+ if(!setVersion<T>(obj, version))
{
return Qnil;
}
@@ -104,7 +91,7 @@ versionToString(VALUE p, const char* type)
}
T v;
- if(!getVersion<T>(p, v, type))
+ if(!getVersion<T>(p, v))
{
return Qnil;
}
@@ -552,7 +539,7 @@ IceRuby::getEncodingVersion(VALUE p, Ice::EncodingVersion& v)
throw RubyException(rb_eTypeError, "value is not an Ice::EncodingVersion");
}
- if(!getVersion<Ice::EncodingVersion>(p, v, Ice_EncodingVersion))
+ if(!getVersion<Ice::EncodingVersion>(p, v))
{
return false;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 09:00:21 +0000