1 files changed, 1 insertions, 38 deletions
diff --git a/rb/src/IceRuby/Util.cpp b/rb/src/IceRuby/Util.cpp
index b5333cbcbd1..6e62ee391d5 100644
--- a/rb/src/IceRuby/Util.cpp
+++ b/rb/src/IceRuby/Util.cpp
@@ -99,7 +99,7 @@ versionToString(VALUE p)
     T v;
     if(!getVersion<T, PT>(p, v))
     {
-        return NULL;
+        return Qnil;
     }
 
     ICE_RUBY_TRY
@@ -558,43 +558,6 @@ IceRuby::getEncodingVersion(VALUE p, Ice::EncodingVersion& v)
     return true;
 }
 
-#if 0
-VALUE
-IceRuby::currentProtocol(VALUE)
-{
-}
-
-VALUE
-IceRuby::currentProtocolEncoding(VALUE)
-{
-}
-
-VALUE
-IceRuby::currentEncoding(VALUE)
-{
-}
-
-VALUE
-IceRuby::protocolVersionToString(VALUE, VALUE)
-{
-}
-
-VALUE
-IceRuby::stringToProtocolVersion(VALUE, VALUE)
-{
-}
-
-VALUE
-IceRuby::encodingVersionToString(VALUE, VALUE)
-{
-}
-
-VALUE
-IceRuby::stringToEncodingVersion(VALUE, VALUE)
-{
-}
-#endif
-
 VALUE
 IceRuby::callProtected(RubyFunction func, VALUE arg)
 {