zeroc-ice 3.7.11 → 3.8.1

data/dist/IceRuby/Communicator.h

@@ -1,20 +1,19 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_RUBY_COMMUNICATOR_H
 #define ICE_RUBY_COMMUNICATOR_H
 
-#include <Config.h>
-#include <Ice/CommunicatorF.h>
+#include "Config.h"
+#include "Ice/CommunicatorF.h"
+#include "Ice/SliceLoader.h"
 
 namespace IceRuby
 {
+    void initCommunicator(VALUE);
+    Ice::CommunicatorPtr getCommunicator(VALUE);
 
-void initCommunicator(VALUE);
-Ice::CommunicatorPtr getCommunicator(VALUE);
-VALUE lookupCommunicator(const Ice::CommunicatorPtr&);
-
+    VALUE lookupCommunicator(const Ice::CommunicatorPtr&);
+    Ice::SliceLoaderPtr lookupSliceLoader(const Ice::CommunicatorPtr&);
 }
 
 #endif

data/dist/IceRuby/Config.h

@@ -1,6 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_RUBY_CONFIG_H
 #define ICE_RUBY_CONFIG_H
@@ -9,33 +7,7 @@
 // This file includes <ruby.h> and should always be included first.
 //
 
-#include <Ice/Config.h>
-
-//
-// COMPILERFIX: This is required to prevent annoying warnings with aCC.
-// The aCC -mt option causes the definition of the _POSIX_C_SOURCE macro
-// (with another lower value.) and this is causing a warning because of
-// the redefinition.
-//
-//#if defined(__HP_aCC) && defined(_POSIX_C_SOURCE)
-//#    undef _POSIX_C_SOURCE
-//#endif
-
-//
-// Ruby defines _FILE_OFFSET_BITS without a guard; we undefine it to
-// avoid a warning
-//
-#if defined(__SUNPRO_CC) && defined(_FILE_OFFSET_BITS)
-   #undef _FILE_OFFSET_BITS
-#endif
-
-//
-// COMPILERFIX: Mingw headers fail to find some definitions if
-// wincrypt.h isn't included before ruby.h
-//
-#ifdef _WIN32
-#   include <wincrypt.h>
-#endif
+#include "Ice/Config.h"
 
 // The ruby.h check for the isfinite macro fails with some C++ standard libraries
 // (libc++ > 4000) because the isfinite macro included from the C library's
@@ -44,7 +16,7 @@
 // The warning ends up causing a build failure. We define the HAVE_ISFINITE macro here to
 // ensure ruby.h doesn't redefine it.
 #if defined(__clang__) && defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 4000)
-#define HAVE_ISFINITE 1
+#    define HAVE_ISFINITE 1
 #endif
 
 //
@@ -53,37 +25,34 @@
 #if defined(__clang__)
 // BUGFIX: Workaround clang 13 warnings during ruby macro expansion, it is important to put this before the push/pop
 // directives to keep the warnings ignored in the source files where macros are expanded.
-#   if __clang_major__ >= 13
-#       pragma clang diagnostic ignored "-Wcompound-token-split-by-macro"
-#   endif
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wunused-parameter"
+#    if __clang_major__ >= 13
+#        pragma clang diagnostic ignored "-Wcompound-token-split-by-macro"
+#    endif
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wunused-parameter"
 //
 // BUGFIX: Workaround clang conversion warnings in ruby headers
 //
-#   pragma clang diagnostic ignored "-Wconversion"
+#    pragma clang diagnostic ignored "-Wconversion"
 
 // Silence warnings regarding missing deprecation attributes in ruby headers
-#   pragma clang diagnostic ignored "-Wdocumentation"
-#   pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
+#    pragma clang diagnostic ignored "-Wdocumentation"
+#    pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
 #elif defined(__GNUC__)
-#   pragma GCC diagnostic push
-#   pragma GCC diagnostic ignored "-Wunused-parameter"
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wunused-parameter"
 // BUGFIX Workaround G++ 10 problem with ruby headers
 // see https://bugs.ruby-lang.org/issues/16930
-#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 #include <ruby.h>
-
-#ifdef HAVE_RUBY_ENCODING_H
-#  include <ruby/encoding.h>
-#endif
+#include <ruby/encoding.h>
 
 #if defined(__clang__)
-#   pragma clang diagnostic pop
+#    pragma clang diagnostic pop
 #elif defined(__GNUC__)
-#   pragma GCC diagnostic pop
+#    pragma GCC diagnostic pop
 #endif
 
 //
@@ -91,53 +60,18 @@
 // functions like shutdown() and close() that wreak havoc.
 //
 #ifdef _WIN32
-#   undef shutdown
-#   undef close
-#   undef read
-#   undef write
-#   undef sleep
+#    undef shutdown
+#    undef close
+#    undef read
+#    undef write
+#    undef sleep
 #endif
 
 extern "C"
 {
-typedef VALUE(*ICE_RUBY_ENTRY_POINT)(...);
+    typedef VALUE (*ICE_RUBY_ENTRY_POINT)(...);
 }
 
 #define CAST_METHOD(X) reinterpret_cast<ICE_RUBY_ENTRY_POINT>(X)
 
-//
-// These macros are defined in Ruby 1.9 but not in 1.8. We define them here
-// to maintain compatibility with 1.8.
-//
-#ifndef RARRAY_PTR
-#   define RARRAY_PTR(v) RARRAY(v)->ptr
-#endif
-
-#ifndef RARRAY_LEN
-#   define RARRAY_LEN(v) RARRAY(v)->len
-#endif
-
-#ifndef RSTRING_PTR
-#   define RSTRING_PTR(v) RSTRING(v)->ptr
-#endif
-
-#ifndef RSTRING_LEN
-#   define RSTRING_LEN(v) RSTRING(v)->len
-#endif
-
-#ifndef RFLOAT_VALUE
-#   define RFLOAT_VALUE(v) RFLOAT(v)->value
-#endif
-
-//
-// The RARRAY_AREF and RARRAY_ASET macros were added in Ruby 2.1.
-//
-#ifndef RARRAY_AREF
-#   define RARRAY_AREF(a, i) (RARRAY_PTR(a)[i])
-#endif
-
-#ifndef RARRAY_ASET
-#   define RARRAY_ASET(a, i, v) RARRAY_PTR(a)[i] = v
-#endif
-
 #endif