qpid_proton 0.37.0 → 0.40.0

data/ext/cproton/cproton.c

@@ -1,18 +1,14 @@
 /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
+ * This file was automatically generated by SWIG (https://www.swig.org).
+ * Version 4.3.0
  *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG
- * interface file instead.
+ * Do not make changes to this file unless you know what you are doing - modify
+ * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
 
-#ifndef SWIGRUBY
+#define SWIG_VERSION 0x040300
 #define SWIGRUBY
-#endif
-
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -138,6 +134,40 @@
 # pragma warning disable 592
 #endif
 
+#if defined(__cplusplus) && __cplusplus >=201103L
+# define SWIG_NULLPTR nullptr
+#else
+# define SWIG_NULLPTR NULL
+#endif 
+
+/* -----------------------------------------------------------------------------
+ * swigcompat.swg
+ *
+ * Macros to provide support compatibility with older C and C++ standards.
+ *
+ * Note that SWIG expects __cplusplus to be defined to the appropriate C++ standard.
+ * MSVC users are urged to check and examine the /Zc:__cplusplus compiler option.
+ * See https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus.
+ * ----------------------------------------------------------------------------- */
+
+/* C99 and C++11 should provide snprintf, but define SWIG_NO_SNPRINTF
+ * if you're missing it.
+ */
+#if ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) || \
+     (defined __cplusplus && __cplusplus >= 201103L) || \
+     defined SWIG_HAVE_SNPRINTF) && \
+    !defined SWIG_NO_SNPRINTF
+# define SWIG_snprintf(O,S,F,A) snprintf(O,S,F,A)
+# define SWIG_snprintf2(O,S,F,A,B) snprintf(O,S,F,A,B)
+#else
+/* Fallback versions ignore the buffer size, but most of our uses either have a
+ * fixed maximum possible size or dynamically allocate a buffer that's large
+ * enough.
+ */
+# define SWIG_snprintf(O,S,F,A) sprintf(O,F,A)
+# define SWIG_snprintf2(O,S,F,A,B) sprintf(O,F,A,B)
+#endif
+
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
  *  declarations/attributes, and other compiler dependent labels.
@@ -262,6 +292,12 @@
 # pragma warning disable 592
 #endif
 
+#if defined(__cplusplus) && __cplusplus >=201103L
+# define SWIG_NULLPTR nullptr
+#else
+# define SWIG_NULLPTR NULL
+#endif 
+
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
@@ -308,6 +344,8 @@
 #define SWIG_POINTER_DISOWN        0x1
 #define SWIG_CAST_NEW_MEMORY       0x2
 #define SWIG_POINTER_NO_NULL       0x4
+#define SWIG_POINTER_CLEAR         0x8
+#define SWIG_POINTER_RELEASE       (SWIG_POINTER_CLEAR | SWIG_POINTER_DISOWN)
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -379,7 +417,7 @@
    SWIG errors code.
 
    Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-   allows to return the 'cast rank', for example, if you have this
+   allows returning the 'cast rank', for example, if you have this
 
        int food(double)
        int fooi(int);
@@ -393,7 +431,13 @@
 */
 
 #define SWIG_OK                    (0)
+/* Runtime errors are < 0 */
 #define SWIG_ERROR                 (-1)
+/* Errors in range -1 to -99 are in swigerrors.swg (errors for all languages including those not using the runtime) */
+/* Errors in range -100 to -199 are language specific errors defined in *errors.swg */
+/* Errors < -200 are generic runtime specific errors */
+#define SWIG_ERROR_RELEASE_NOT_OWNED (-200)
+
 #define SWIG_IsOK(r)               (r >= 0)
 #define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
@@ -401,14 +445,14 @@
 #define SWIG_CASTRANKLIMIT         (1 << 8)
 /* The NewMask denotes the object was created (using new/malloc) */
 #define SWIG_NEWOBJMASK            (SWIG_CASTRANKLIMIT  << 1)
-/* The TmpMask is for in/out typemaps that use temporal objects */
+/* The TmpMask is for in/out typemaps that use temporary objects */
 #define SWIG_TMPOBJMASK            (SWIG_NEWOBJMASK << 1)
 /* Simple returning values */
 #define SWIG_BADOBJ                (SWIG_ERROR)
 #define SWIG_OLDOBJ                (SWIG_OK)
 #define SWIG_NEWOBJ                (SWIG_OK | SWIG_NEWOBJMASK)
 #define SWIG_TMPOBJ                (SWIG_OK | SWIG_TMPOBJMASK)
-/* Check, add and del mask methods */
+/* Check, add and del object mask methods */
 #define SWIG_AddNewMask(r)         (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r)
 #define SWIG_DelNewMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r)
 #define SWIG_IsNewObj(r)           (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK))
@@ -554,7 +598,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+SWIG_TypeCheckStruct(const swig_type_info *from, swig_type_info *ty) {
   if (ty) {
     swig_cast_info *iter = ty->cast;
     while (iter) {
@@ -614,9 +658,9 @@ SWIG_TypeName(const swig_type_info *ty) {
 SWIGRUNTIME const char *
 SWIG_TypePrettyName(const swig_type_info *type) {
   /* The "str" field contains the equivalent pretty names of the
-     type, separated by vertical-bar characters.  We choose
-     to print the last name, as it is often (?) the most
-     specific. */
+     type, separated by vertical-bar characters.  Choose the last
+     name. It should be the most specific; a fully resolved name
+     but not necessarily with default template parameters expanded. */
   if (!type) return NULL;
   if (type->str != NULL) {
     const char *last_name = type->str;
@@ -836,7 +880,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 }
 #endif
 
-/*  Errors in SWIG */
+/* SWIG Errors applicable to all language modules, values are reserved from -1 to -99 */
 #define  SWIG_UnknownError    	   -1
 #define  SWIG_IOError        	   -2
 #define  SWIG_RuntimeError   	   -3
@@ -852,8 +896,25 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #define  SWIG_NullReferenceError   -13
 
 
+#if __GNUC__ >= 7
+#pragma GCC diagnostic push
+#if defined(__cplusplus)
+#pragma GCC diagnostic ignored "-Wregister"
+#if __GNUC__ >= 10
+#pragma GCC diagnostic ignored "-Wvolatile"
+#if __GNUC__ >= 11
+#pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion"
+#endif
+#endif
+#endif
+#endif
 
 #include <ruby.h>
+#include <ruby/version.h> /* For RUBY_API_VERSION_CODE */
+
+#if __GNUC__ >= 7
+#pragma GCC diagnostic pop
+#endif
 
 /* Ruby 1.9.1 has a "memoisation optimisation" when compiling with GCC which
  * breaks using rb_intern as an lvalue, as SWIG does.  We work around this
@@ -955,9 +1016,9 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 /*
  * The following macros are used for providing the correct type of a
  * function pointer to the Ruby C API.
- * Starting with Ruby 2.7 (corresponding to RB_METHOD_DEFINITION_DECL being
- * defined) these macros act transparently due to Ruby's moving away from
- * ANYARGS and instead employing strict function signatures.
+ *
+ * Starting with Ruby 2.7 these macros act transparently due to Ruby's moving
+ * moving away from ANYARGS and instead employing strict function signatures.
  *
  * Note: In case of C (not C++) the macros are transparent even before
  * Ruby 2.7 due to the fact that the Ruby C API used function declarators
@@ -981,7 +1042,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
  * SWIG_RUBY_INT_ANYARGS_FUNC(f) is used for the function pointer
  * argument(s) of Ruby C API functions like st_foreach().
  */
-#if defined(__cplusplus) && !defined(RB_METHOD_DEFINITION_DECL)
+#if defined(__cplusplus) && RUBY_API_VERSION_CODE < 20700
 #  define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
 #  define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
 #  define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
@@ -1032,15 +1093,12 @@ static VALUE _mSWIG = Qnil;
 
 
 /* Define custom exceptions for errors that do not map to existing Ruby
-   exceptions.  Note this only works for C++ since a global cannot be
-   initialized by a function in C.  For C, fallback to rb_eRuntimeError.*/
+   exceptions. */
 
 SWIGINTERN VALUE 
 getNullReferenceError(void) {
-  static int init = 0;
-  static VALUE rb_eNullReferenceError ;
-  if (!init) {
-    init = 1;
+  static VALUE rb_eNullReferenceError = Qnil;
+  if (rb_eNullReferenceError == Qnil) {
     rb_eNullReferenceError = rb_define_class("NullReferenceError", rb_eRuntimeError);
   }
   return rb_eNullReferenceError;
@@ -1048,10 +1106,8 @@ getNullReferenceError(void) {
 
 SWIGINTERN VALUE 
 getObjectPreviouslyDeletedError(void) {
-  static int init = 0;
-  static VALUE rb_eObjectPreviouslyDeleted ;
-  if (!init) {
-    init = 1;
+  static VALUE rb_eObjectPreviouslyDeleted = Qnil;
+  if (rb_eObjectPreviouslyDeleted == Qnil) {
     rb_eObjectPreviouslyDeleted = rb_define_class("ObjectPreviouslyDeleted", rb_eRuntimeError);
   }
   return rb_eObjectPreviouslyDeleted;
@@ -1134,7 +1190,7 @@ const char* Ruby_Format_TypeError( const char* msg,
     }
 
   str = rb_str_cat2( str, "Expected argument " );
-  sprintf( buf, "%d of type ", argn-1 );
+  SWIG_snprintf( buf, sizeof( buf), "%d of type ", argn-1 );
   str = rb_str_cat2( str, buf );
   str = rb_str_cat2( str, type );
   str = rb_str_cat2( str, ", but got " );
@@ -1323,8 +1379,8 @@ extern "C" {
 #endif
 
 SWIGINTERN VALUE
-SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
-  if (NIL_P(target)) {
+SWIG_Ruby_AppendOutput(VALUE target, VALUE o, int is_void) {
+  if (NIL_P(target) && is_void) {
     target = o;
   } else {
     if (TYPE(target) != T_ARRAY) {
@@ -1433,6 +1489,7 @@ static VALUE swig_runtime_data_type_pointer = Qnil;
 /* Global IDs used to keep some internal SWIG stuff */
 static ID swig_arity_id = 0;
 static ID swig_call_id  = 0;
+static ID swig_lowerthan_id = 0;
 
 /*
   If your swig extension is to be run within an embedded ruby and has
@@ -1466,10 +1523,8 @@ static ID swig_call_id  = 0;
 
 SWIGRUNTIME VALUE 
 getExceptionClass(void) {
-  static int init = 0;
-  static VALUE rubyExceptionClass ;
-  if (!init) {
-    init = 1;
+  static VALUE rubyExceptionClass = Qnil;
+  if (rubyExceptionClass == Qnil) {
     rubyExceptionClass = rb_const_get(_mSWIG, rb_intern("Exception"));
   }
   return rubyExceptionClass;
@@ -1484,7 +1539,7 @@ SWIG_Ruby_ExceptionType(swig_type_info *desc, VALUE obj) {
   VALUE exceptionClass = getExceptionClass();
   if (rb_obj_is_kind_of(obj, exceptionClass)) {
     return obj;
-  }  else {
+  } else {
     return rb_exc_new3(rb_eRuntimeError, rb_obj_as_string(obj));
   }
 }
@@ -1497,6 +1552,7 @@ SWIG_Ruby_InitRuntime(void)
     _mSWIG = rb_define_module("SWIG");
     swig_call_id  = rb_intern("call");
     swig_arity_id = rb_intern("arity");
+    swig_lowerthan_id = rb_intern("<");
   }
 }
 
@@ -1504,13 +1560,14 @@ SWIG_Ruby_InitRuntime(void)
 SWIGRUNTIME void
 SWIG_Ruby_define_class(swig_type_info *type)
 {
-  char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
-  sprintf(klass_name, "TYPE%s", type->name);
+  size_t klass_len = 4 + strlen(type->name) + 1;
+  char *klass_name = (char *) malloc(klass_len);
+  SWIG_snprintf(klass_name, klass_len, "TYPE%s", type->name);
   if (NIL_P(_cSWIG_Pointer)) {
     _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
     rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
   }
-  rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
+  rb_undef_alloc_func(rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer));
   free((void *) klass_name);
 }
 
@@ -1561,8 +1618,9 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
       SWIG_RubyAddTracking(ptr, obj);
     }
   } else {
-    klass_name = (char *) malloc(4 + strlen(type->name) + 1);
-    sprintf(klass_name, "TYPE%s", type->name);
+    size_t klass_len = 4 + strlen(type->name) + 1;
+    klass_name = (char *) malloc(klass_len);
+    SWIG_snprintf(klass_name, klass_len, "TYPE%s", type->name);
     klass = rb_const_get(_mSWIG, rb_intern(klass_name));
     free((void *) klass_name);
     obj = Data_Wrap_Struct(klass, 0, 0, ptr);
@@ -1634,6 +1692,11 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     own->own = 0;
   }
     
+  if (((flags & SWIG_POINTER_RELEASE) == SWIG_POINTER_RELEASE)) {
+    if (!RDATA(obj)->dfree)
+      return SWIG_ERROR_RELEASE_NOT_OWNED;
+  }
+
   /* Check to see if the input object is giving up ownership
      of the underlying C struct or C++ object.  If so then we
      need to reset the destructor since the Ruby object no 
@@ -1645,7 +1708,7 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
       swig_class *sklass = (swig_class *) ty->clientdata;
       track = sklass->trackObjects;
     }
-		
+
     if (track) {
       /* We are tracking objects for this class.  Thus we change the destructor
        * to SWIG_RubyRemoveTracking.  This allows us to
@@ -1659,6 +1722,10 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     }
   }
 
+  if (flags & SWIG_POINTER_CLEAR) {
+    DATA_PTR(obj) = 0;
+  }
+
   /* Do type-checking if type info was provided */
   if (ty) {
     if (ty->clientdata) {
@@ -1766,6 +1833,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 {
   /* register a new class */
   VALUE cl = rb_define_class("swig_runtime_data", rb_cObject);
+  rb_undef_alloc_func(cl);
   /* create and store the structure pointer to a global variable */
   swig_runtime_data_type_pointer = Data_Wrap_Struct(cl, 0, 0, pointer);
   rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer);
@@ -1796,7 +1864,7 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
   if ( rb_respond_to( proc, swig_arity_id ) )
     {
-      VALUE num = rb_funcall( proc, swig_arity_id, 0 );
+      VALUE num = rb_funcall2( proc, swig_arity_id, 0, 0 );
       int arity = NUM2INT(num);
       if ( arity < 0 && (arity+1) < -minimal ) return 1;
       if ( arity == minimal ) return 1;
@@ -1814,7 +1882,7 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 
 #define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0) 
 
-#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else 
+#define SWIG_contract_assert(expr, msg) do { if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } } while (0) 
 
 
 
@@ -1824,9 +1892,9 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_Pni_rbhandler_t swig_types[1]
 #define SWIGTYPE_p_char swig_types[2]
 #define SWIGTYPE_p_f_p_struct_pn_transport_t_p_q_const__char__void swig_types[3]
-#define SWIGTYPE_p_f_p_void__p_void swig_types[4]
-#define SWIGTYPE_p_int swig_types[5]
-#define SWIGTYPE_p_intptr_t swig_types[6]
+#define SWIGTYPE_p_f_p_void__int swig_types[4]
+#define SWIGTYPE_p_f_p_void__void swig_types[5]
+#define SWIGTYPE_p_int swig_types[6]
 #define SWIGTYPE_p_long swig_types[7]
 #define SWIGTYPE_p_long_long swig_types[8]
 #define SWIGTYPE_p_p_char swig_types[9]
@@ -1850,48 +1918,43 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_pn_event_type_t swig_types[27]
 #define SWIGTYPE_p_pn_expiry_policy_t swig_types[28]
 #define SWIGTYPE_p_pn_handler_t swig_types[29]
-#define SWIGTYPE_p_pn_hash_t swig_types[30]
-#define SWIGTYPE_p_pn_iterator_t swig_types[31]
-#define SWIGTYPE_p_pn_link_t swig_types[32]
-#define SWIGTYPE_p_pn_list_t swig_types[33]
-#define SWIGTYPE_p_pn_listener_t swig_types[34]
-#define SWIGTYPE_p_pn_logger_t swig_types[35]
-#define SWIGTYPE_p_pn_map_t swig_types[36]
-#define SWIGTYPE_p_pn_message_t swig_types[37]
-#define SWIGTYPE_p_pn_messenger_t swig_types[38]
-#define SWIGTYPE_p_pn_proactor_t swig_types[39]
-#define SWIGTYPE_p_pn_raw_connection_t swig_types[40]
-#define SWIGTYPE_p_pn_rcv_settle_mode_t swig_types[41]
-#define SWIGTYPE_p_pn_record_t swig_types[42]
-#define SWIGTYPE_p_pn_rwbytes_t swig_types[43]
-#define SWIGTYPE_p_pn_sasl_outcome_t swig_types[44]
-#define SWIGTYPE_p_pn_sasl_t swig_types[45]
-#define SWIGTYPE_p_pn_session_t swig_types[46]
-#define SWIGTYPE_p_pn_snd_settle_mode_t swig_types[47]
-#define SWIGTYPE_p_pn_ssl_cert_subject_subfield swig_types[48]
-#define SWIGTYPE_p_pn_ssl_domain_t swig_types[49]
-#define SWIGTYPE_p_pn_ssl_hash_alg swig_types[50]
-#define SWIGTYPE_p_pn_ssl_mode_t swig_types[51]
-#define SWIGTYPE_p_pn_ssl_resume_status_t swig_types[52]
-#define SWIGTYPE_p_pn_ssl_t swig_types[53]
-#define SWIGTYPE_p_pn_ssl_verify_mode_t swig_types[54]
-#define SWIGTYPE_p_pn_string_t swig_types[55]
-#define SWIGTYPE_p_pn_terminus_t swig_types[56]
-#define SWIGTYPE_p_pn_terminus_type_t swig_types[57]
-#define SWIGTYPE_p_pn_transport_t swig_types[58]
-#define SWIGTYPE_p_pn_type_t swig_types[59]
-#define SWIGTYPE_p_pn_url_t swig_types[60]
-#define SWIGTYPE_p_pn_uuid_t swig_types[61]
-#define SWIGTYPE_p_short swig_types[62]
-#define SWIGTYPE_p_signed_char swig_types[63]
-#define SWIGTYPE_p_unsigned_char swig_types[64]
-#define SWIGTYPE_p_unsigned_int swig_types[65]
-#define SWIGTYPE_p_unsigned_long swig_types[66]
-#define SWIGTYPE_p_unsigned_long_long swig_types[67]
-#define SWIGTYPE_p_unsigned_short swig_types[68]
-#define SWIGTYPE_p_void swig_types[69]
-static swig_type_info *swig_types[71];
-static swig_module_info swig_module = {swig_types, 70, 0, 0, 0, 0};
+#define SWIGTYPE_p_pn_link_t swig_types[30]
+#define SWIGTYPE_p_pn_listener_t swig_types[31]
+#define SWIGTYPE_p_pn_logger_t swig_types[32]
+#define SWIGTYPE_p_pn_message_t swig_types[33]
+#define SWIGTYPE_p_pn_messenger_t swig_types[34]
+#define SWIGTYPE_p_pn_proactor_t swig_types[35]
+#define SWIGTYPE_p_pn_raw_connection_t swig_types[36]
+#define SWIGTYPE_p_pn_rcv_settle_mode_t swig_types[37]
+#define SWIGTYPE_p_pn_record_t swig_types[38]
+#define SWIGTYPE_p_pn_rwbytes_t swig_types[39]
+#define SWIGTYPE_p_pn_sasl_outcome_t swig_types[40]
+#define SWIGTYPE_p_pn_sasl_t swig_types[41]
+#define SWIGTYPE_p_pn_session_t swig_types[42]
+#define SWIGTYPE_p_pn_snd_settle_mode_t swig_types[43]
+#define SWIGTYPE_p_pn_ssl_cert_subject_subfield swig_types[44]
+#define SWIGTYPE_p_pn_ssl_domain_t swig_types[45]
+#define SWIGTYPE_p_pn_ssl_hash_alg swig_types[46]
+#define SWIGTYPE_p_pn_ssl_mode_t swig_types[47]
+#define SWIGTYPE_p_pn_ssl_resume_status_t swig_types[48]
+#define SWIGTYPE_p_pn_ssl_t swig_types[49]
+#define SWIGTYPE_p_pn_ssl_verify_mode_t swig_types[50]
+#define SWIGTYPE_p_pn_terminus_t swig_types[51]
+#define SWIGTYPE_p_pn_terminus_type_t swig_types[52]
+#define SWIGTYPE_p_pn_transport_t swig_types[53]
+#define SWIGTYPE_p_pn_type_t swig_types[54]
+#define SWIGTYPE_p_pn_url_t swig_types[55]
+#define SWIGTYPE_p_pn_uuid_t swig_types[56]
+#define SWIGTYPE_p_short swig_types[57]
+#define SWIGTYPE_p_signed_char swig_types[58]
+#define SWIGTYPE_p_unsigned_char swig_types[59]
+#define SWIGTYPE_p_unsigned_int swig_types[60]
+#define SWIGTYPE_p_unsigned_long swig_types[61]
+#define SWIGTYPE_p_unsigned_long_long swig_types[62]
+#define SWIGTYPE_p_unsigned_short swig_types[63]
+#define SWIGTYPE_p_void swig_types[64]
+static swig_type_info *swig_types[66];
+static swig_module_info swig_module = {swig_types, 65, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1906,10 +1969,6 @@ static VALUE mCproton;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040002 
-#define SWIG_VERSION SWIGVERSION
-
-
 #define SWIG_as_voidptr(a) (void *)((const void *)(a)) 
 #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
 
@@ -1917,6 +1976,7 @@ static VALUE mCproton;
 #define PN_USE_DEPRECATED_API 1
 
 #include <proton/connection_driver.h>
+#include <proton/cid.h>
 #include <proton/engine.h>
 #include <proton/handlers.h>
 #include <proton/message.h>
@@ -1941,7 +2001,6 @@ SWIG_ruby_failed(VALUE SWIGUNUSEDPARM(arg1), VALUE SWIGUNUSEDPARM(arg2))
 } 
 
 
-/*@SWIG:/usr/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -1951,7 +2010,6 @@ SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE arg)
   *res = type == T_FIXNUM ? NUM2ULONG(obj) : rb_big2ulong(obj);
   return obj;
 }
-/*@SWIG@*/
 
 SWIGINTERN int
 SWIG_AsVal_unsigned_SS_long (VALUE obj, unsigned long *val) 
@@ -1963,6 +2021,8 @@ SWIG_AsVal_unsigned_SS_long (VALUE obj, unsigned long *val)
     a[0] = obj;
     a[1] = (VALUE)(&v);
     if (rb_rescue(VALUEFUNC(SWIG_AUX_NUM2ULONG), (VALUE)a, VALUEFUNC(SWIG_ruby_failed), 0) != Qnil) {
+      if (rb_funcall(obj, swig_lowerthan_id, 1, INT2FIX(0)) != Qfalse)
+        return SWIG_OverflowError;
       if (val) *val = v;
       return SWIG_OK;
     }
@@ -1987,7 +2047,6 @@ SWIG_AsVal_unsigned_SS_long (VALUE obj, unsigned long *val)
 
 
 #ifdef SWIG_LONG_LONG_AVAILABLE
-/*@SWIG:/usr/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -1997,7 +2056,6 @@ SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE arg)
   *res = type == T_FIXNUM ? NUM2ULL(obj) : rb_big2ull(obj);
   return obj;
 }
-/*@SWIG@*/
 
 SWIGINTERN int
 SWIG_AsVal_unsigned_SS_long_SS_long (VALUE obj, unsigned long long *val)
@@ -2009,6 +2067,8 @@ SWIG_AsVal_unsigned_SS_long_SS_long (VALUE obj, unsigned long long *val)
     a[0] = obj;
     a[1] = (VALUE)(&v);
     if (rb_rescue(VALUEFUNC(SWIG_AUX_NUM2ULL), (VALUE)a, VALUEFUNC(SWIG_ruby_failed), 0) != Qnil) {
+      if (rb_funcall(obj, swig_lowerthan_id, 1, INT2FIX(0)) != Qfalse)
+        return SWIG_OverflowError;
       if (val) *val = v;
       return SWIG_OK;
     }
@@ -2042,11 +2102,9 @@ SWIG_AsVal_size_t (VALUE obj, size_t *val)
 SWIGINTERN swig_type_info*
 SWIG_pchar_descriptor(void)
 {
-  static int init = 0;
   static swig_type_info* info = 0;
-  if (!init) {
+  if (!info) {
     info = SWIG_TypeQuery("_p_char");
-    init = 1;
   }
   return info;
 }
@@ -2318,7 +2376,6 @@ SWIG_From_bool  (bool value)
 
 
 
-/*@SWIG:/usr/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2328,7 +2385,6 @@ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE arg)
   *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj);
   return obj;
 }
-/*@SWIG@*/
 
 SWIGINTERN int
 SWIG_AsVal_long (VALUE obj, long* val)
@@ -2389,19 +2445,14 @@ void Pn_rbkey_finalize(void *vp_rbkey) {
   }
 }
 
-/* NOTE: no macro or preprocessor definitions in %inline sections */
-#define CID_Pn_rbkey CID_pn_void
-#define Pn_rbkey_inspect NULL
-#define Pn_rbkey_compare NULL
-#define Pn_rbkey_hashcode NULL
+static pn_class_t *Pn_rbkey_class;
 
 pn_class_t* Pn_rbkey__class(void) {
-    static pn_class_t clazz = PN_CLASS(Pn_rbkey);
-    return &clazz;
+    return Pn_rbkey_class;
 }
 
 Pn_rbkey_t *Pn_rbkey_new(void) {
-    return (Pn_rbkey_t *) pn_class_new(Pn_rbkey__class(), sizeof(Pn_rbkey_t));
+    return (Pn_rbkey_t *) pn_class_new(Pn_rbkey_class, sizeof(Pn_rbkey_t));
 }
 
 
@@ -2584,102 +2635,6 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 }
 
 
-#include <float.h>
-
-
-#include <math.h>
-
-
-/* Getting isfinite working pre C99 across multiple platforms is non-trivial. Users can provide SWIG_isfinite on older platforms. */
-#ifndef SWIG_isfinite
-/* isfinite() is a macro for C99 */
-# if defined(isfinite)
-#  define SWIG_isfinite(X) (isfinite(X))
-# elif defined(__cplusplus) && __cplusplus >= 201103L
-/* Use a template so that this works whether isfinite() is std::isfinite() or
- * in the global namespace.  The reality seems to vary between compiler
- * versions.
- *
- * Make sure namespace std exists to avoid compiler warnings.
- *
- * extern "C++" is required as this fragment can end up inside an extern "C" { } block
- */
-namespace std { }
-extern "C++" template<typename T>
-inline int SWIG_isfinite_func(T x) {
-  using namespace std;
-  return isfinite(x);
-}
-#  define SWIG_isfinite(X) (SWIG_isfinite_func(X))
-# elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
-#  define SWIG_isfinite(X) (__builtin_isfinite(X))
-# elif defined(__clang__) && defined(__has_builtin)
-#  if __has_builtin(__builtin_isfinite)
-#   define SWIG_isfinite(X) (__builtin_isfinite(X))
-#  endif
-# elif defined(_MSC_VER)
-#  define SWIG_isfinite(X) (_finite(X))
-# elif defined(__sun) && defined(__SVR4)
-#  include <ieeefp.h>
-#  define SWIG_isfinite(X) (finite(X))
-# endif
-#endif
-
-
-/* Accept infinite as a valid float value unless we are unable to check if a value is finite */
-#ifdef SWIG_isfinite
-# define SWIG_Float_Overflow_Check(X) ((X < -FLT_MAX || X > FLT_MAX) && SWIG_isfinite(X))
-#else
-# define SWIG_Float_Overflow_Check(X) ((X < -FLT_MAX || X > FLT_MAX))
-#endif
-
-
-/*@SWIG:/usr/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
-SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE arg)
-{
-  VALUE *args = (VALUE *)arg;
-  VALUE obj = args[0];
-  VALUE type = TYPE(obj);
-  double *res = (double *)(args[1]);
-  *res = NUM2DBL(obj); (void)type;
-  return obj;
-}
-/*@SWIG@*/
-
-SWIGINTERN int
-SWIG_AsVal_double (VALUE obj, double *val)
-{
-  VALUE type = TYPE(obj);
-  if ((type == T_FLOAT) || (type == T_FIXNUM) || (type == T_BIGNUM)) {
-    double v;
-    VALUE a[2];
-    a[0] = obj;
-    a[1] = (VALUE)(&v);
-    if (rb_rescue(VALUEFUNC(SWIG_AUX_NUM2DBL), (VALUE)a, VALUEFUNC(SWIG_ruby_failed), 0) != Qnil) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-  }
-  return SWIG_TypeError;
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_float (VALUE obj, float *val)
-{
-  double v;
-  int res = SWIG_AsVal_double (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if (SWIG_Float_Overflow_Check(v)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = (float)(v);
-    }
-  }  
-  return res;
-}
-
-
 SWIGINTERN int
 SWIG_AsVal_bool (VALUE obj, bool *val)
 {
@@ -2724,7 +2679,6 @@ SWIG_AsVal_unsigned_SS_short (VALUE obj, unsigned short *val)
 
 
 #ifdef SWIG_LONG_LONG_AVAILABLE
-/*@SWIG:/usr/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2734,7 +2688,6 @@ SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE arg)
   *res = type == T_FIXNUM ? NUM2LL(obj) : rb_big2ll(obj);
   return obj;
 }
-/*@SWIG@*/
 
 SWIGINTERN int
 SWIG_AsVal_long_SS_long (VALUE obj, long long *val)
@@ -2823,6 +2776,96 @@ SWIG_AsVal_short (VALUE obj, short *val)
 }
 
 
+#include <float.h>
+
+
+#include <math.h>
+
+
+/* Getting isfinite working pre C99 across multiple platforms is non-trivial. Users can provide SWIG_isfinite on older platforms. */
+#ifndef SWIG_isfinite
+/* isfinite() is a macro for C99 */
+# if defined(isfinite)
+#  define SWIG_isfinite(X) (isfinite(X))
+# elif defined(__cplusplus) && __cplusplus >= 201103L
+/* Use a template so that this works whether isfinite() is std::isfinite() or
+ * in the global namespace.  The reality seems to vary between compiler
+ * versions.
+ *
+ * Make sure namespace std exists to avoid compiler warnings.
+ *
+ * extern "C++" is required as this fragment can end up inside an extern "C" { } block
+ */
+namespace std { }
+extern "C++" template<typename T>
+inline int SWIG_isfinite_func(T x) {
+  using namespace std;
+  return isfinite(x);
+}
+#  define SWIG_isfinite(X) (SWIG_isfinite_func(X))
+# elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#  define SWIG_isfinite(X) (__builtin_isfinite(X))
+# elif defined(_MSC_VER)
+#  define SWIG_isfinite(X) (_finite(X))
+# elif defined(__sun) && defined(__SVR4)
+#  include <ieeefp.h>
+#  define SWIG_isfinite(X) (finite(X))
+# endif
+#endif
+
+
+/* Accept infinite as a valid float value unless we are unable to check if a value is finite */
+#ifdef SWIG_isfinite
+# define SWIG_Float_Overflow_Check(X) ((X < -FLT_MAX || X > FLT_MAX) && SWIG_isfinite(X))
+#else
+# define SWIG_Float_Overflow_Check(X) ((X < -FLT_MAX || X > FLT_MAX))
+#endif
+
+
+SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE arg)
+{
+  VALUE *args = (VALUE *)arg;
+  VALUE obj = args[0];
+  VALUE type = TYPE(obj);
+  double *res = (double *)(args[1]);
+  *res = NUM2DBL(obj); (void)type;
+  return obj;
+}
+
+SWIGINTERN int
+SWIG_AsVal_double (VALUE obj, double *val)
+{
+  VALUE type = TYPE(obj);
+  if ((type == T_FLOAT) || (type == T_FIXNUM) || (type == T_BIGNUM)) {
+    double v;
+    VALUE a[2];
+    a[0] = obj;
+    a[1] = (VALUE)(&v);
+    if (rb_rescue(VALUEFUNC(SWIG_AUX_NUM2DBL), (VALUE)a, VALUEFUNC(SWIG_ruby_failed), 0) != Qnil) {
+      if (val) *val = v;
+      return SWIG_OK;
+    }
+  }
+  return SWIG_TypeError;
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_float (VALUE obj, float *val)
+{
+  double v;
+  int res = SWIG_AsVal_double (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if (SWIG_Float_Overflow_Check(v)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = (float)(v);
+    }
+  }  
+  return res;
+}
+
+
 SWIGINTERNINLINE VALUE
 SWIG_From_signed_SS_char  (signed char value)
 {    
@@ -2888,7 +2931,7 @@ _wrap_pn_message_encode(int argc, VALUE *argv, VALUE self) {
   arg3 = &size2;
   result = (int)pn_message_encode(arg1,arg2,arg3);
   vresult = SWIG_From_int((int)(result));
-  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(arg2,*arg3));
+  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(arg2,*arg3), 0);
   if (buff2) free((char*)buff2);
   return vresult;
 fail:
@@ -2967,7 +3010,7 @@ _wrap_pn_link_recv(int argc, VALUE *argv, VALUE self) {
   arg3 = &size2;
   result = (int)wrap_pn_link_recv(arg1,arg2,arg3);
   vresult = SWIG_From_int((int)(result));
-  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(arg2,*arg3));
+  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(arg2,*arg3), 0);
   if (buff2) free((char*)buff2);
   return vresult;
 fail:
@@ -3046,7 +3089,7 @@ _wrap_pn_transport_output(int argc, VALUE *argv, VALUE self) {
   arg3 = &size2;
   result = (int)wrap_pn_transport_output(arg1,arg2,arg3);
   vresult = SWIG_From_int((int)(result));
-  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(arg2,*arg3));
+  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(arg2,*arg3), 0);
   if (buff2) free((char*)buff2);
   return vresult;
 fail:
@@ -3087,7 +3130,7 @@ _wrap_pn_transport_peek(int argc, VALUE *argv, VALUE self) {
   arg3 = &size2;
   result = (int)wrap_pn_transport_peek(arg1,arg2,arg3);
   vresult = SWIG_From_int((int)(result));
-  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(arg2,*arg3));
+  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(arg2,*arg3), 0);
   if (buff2) free((char*)buff2);
   return vresult;
 fail:
@@ -3156,7 +3199,7 @@ _wrap_pn_delivery_tag(int argc, VALUE *argv, VALUE self) {
   arg1 = (pn_delivery_t *)(argp1);
   wrap_pn_delivery_tag(arg1,arg2,arg3);
   if (*arg2) {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(*arg2,*arg3));
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(*arg2,*arg3), 1);
     free(*arg2);
   }
   return vresult;
@@ -3195,7 +3238,7 @@ _wrap_pn_ssl_get_cipher_name(int argc, VALUE *argv, VALUE self) {
   arg2 = (char *)(buff2);
   result = (bool)pn_ssl_get_cipher_name(arg1,arg2,arg3);
   vresult = SWIG_From_bool((bool)(result));
-  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtr(arg2));
+  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtr(arg2), 0);
   if (buff2) free((char*)buff2);
   return vresult;
 fail:
@@ -3234,7 +3277,7 @@ _wrap_pn_ssl_get_protocol_name(int argc, VALUE *argv, VALUE self) {
   arg2 = (char *)(buff2);
   result = (bool)pn_ssl_get_protocol_name(arg1,arg2,arg3);
   vresult = SWIG_From_bool((bool)(result));
-  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtr(arg2));
+  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtr(arg2), 0);
   if (buff2) free((char*)buff2);
   return vresult;
 fail:
@@ -3650,7 +3693,7 @@ _wrap_pn_ssl_get_peer_hostname(int argc, VALUE *argv, VALUE self) {
   arg3 = &size2;
   result = (int)pn_ssl_get_peer_hostname(arg1,arg2,arg3);
   vresult = SWIG_From_int((int)(result));
-  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(arg2,*arg3));
+  vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize(arg2,*arg3), 0);
   if (buff2) free((char*)buff2);
   return vresult;
 fail:
@@ -4151,76 +4194,63 @@ _wrap_pn_rwbytes_null_get(VALUE self) {
 
 
 SWIGINTERN VALUE
-_wrap_PN_OBJECT_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_NewPointerObj(SWIG_as_voidptr(PN_OBJECT), SWIGTYPE_p_pn_class_t,  0 );
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_wrap_PN_VOID_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_NewPointerObj(SWIG_as_voidptr(PN_VOID), SWIGTYPE_p_pn_class_t,  0 );
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_wrap_PN_WEAKREF_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_NewPointerObj(SWIG_as_voidptr(PN_WEAKREF), SWIGTYPE_p_pn_class_t,  0 );
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_class_id(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  pn_cid_t result;
+_wrap_pn_class_create(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  void (*arg2)(void *) = (void (*)(void *)) 0 ;
+  void (*arg3)(void *) = (void (*)(void *)) 0 ;
+  void (*arg4)(void *) = (void (*)(void *)) 0 ;
+  void (*arg5)(void *) = (void (*)(void *)) 0 ;
+  int (*arg6)(void *) = (int (*)(void *)) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  pn_class_t *result = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  if ((argc < 6) || (argc > 6)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_id", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","pn_class_create", 1, argv[0] ));
   }
-  arg1 = (pn_class_t *)(argp1);
-  result = (pn_cid_t)pn_class_id((struct pn_class_t const *)arg1);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_class_name(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  arg1 = (char *)(buf1);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[1], (void**)(&arg2), SWIGTYPE_p_f_p_void__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "void (*)(void *)","pn_class_create", 2, argv[1] )); 
+    }
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_name", 1, argv[0] )); 
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[2], (void**)(&arg3), SWIGTYPE_p_f_p_void__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "void (*)(void *)","pn_class_create", 3, argv[2] )); 
+    }
   }
-  arg1 = (pn_class_t *)(argp1);
-  result = (char *)pn_class_name((struct pn_class_t const *)arg1);
-  vresult = SWIG_FromCharPtr((const char *)result);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[3], (void**)(&arg4), SWIGTYPE_p_f_p_void__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "void (*)(void *)","pn_class_create", 4, argv[3] )); 
+    }
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[4], (void**)(&arg5), SWIGTYPE_p_f_p_void__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "void (*)(void *)","pn_class_create", 5, argv[4] )); 
+    }
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[5], (void**)(&arg6), SWIGTYPE_p_f_p_void__int);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "int (*)(void *)","pn_class_create", 6, argv[5] )); 
+    }
+  }
+  result = (pn_class_t *)pn_class_create((char const *)arg1,arg2,arg3,arg4,arg5,arg6);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_class_t, 0 |  0 );
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return vresult;
 fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return Qnil;
 }
 
@@ -4258,59 +4288,23 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_class_incref(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_incref", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_class_incref", 2, argv[1] )); 
-  }
-  result = (void *)pn_class_incref((struct pn_class_t const *)arg1,arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_class_refcount(int argc, VALUE *argv, VALUE self) {
+_wrap_pn_class_name(int argc, VALUE *argv, VALUE self) {
   pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *arg2 = (void *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int res2 ;
-  int result;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_refcount", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_name", 1, argv[0] )); 
   }
   arg1 = (pn_class_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_class_refcount", 2, argv[1] )); 
-  }
-  result = (int)pn_class_refcount((struct pn_class_t const *)arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
+  result = (char *)pn_class_name((struct pn_class_t const *)arg1);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -4318,28 +4312,22 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_class_decref(int argc, VALUE *argv, VALUE self) {
+_wrap_pn_class_id(int argc, VALUE *argv, VALUE self) {
   pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *arg2 = (void *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int res2 ;
-  int result;
+  pn_cid_t result;
   VALUE vresult = Qnil;
   
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_decref", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_id", 1, argv[0] )); 
   }
   arg1 = (pn_class_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_class_decref", 2, argv[1] )); 
-  }
-  result = (int)pn_class_decref((struct pn_class_t const *)arg1,arg2);
+  result = (pn_cid_t)pn_class_id((struct pn_class_t const *)arg1);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -4348,55 +4336,20 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_class_free(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_free", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_class_free", 2, argv[1] )); 
-  }
-  pn_class_free((struct pn_class_t const *)arg1,arg2);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_class_reify(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
+_wrap_pn_class(int argc, VALUE *argv, VALUE self) {
+  void *arg1 = (void *) 0 ;
+  int res1 ;
   pn_class_t *result = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_reify", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_class_reify", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_class", 1, argv[0] )); 
   }
-  result = (pn_class_t *)pn_class_reify((struct pn_class_t const *)arg1,arg2);
+  result = (pn_class_t *)pn_class(arg1);
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_class_t, 0 |  0 );
   return vresult;
 fail:
@@ -4405,2030 +4358,21 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_class_hashcode(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  uintptr_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_hashcode", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_class_hashcode", 2, argv[1] )); 
-  }
-  result = (uintptr_t)pn_class_hashcode((struct pn_class_t const *)arg1,arg2);
-  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_class_compare(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  int res3 ;
-  intptr_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_compare", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_class_compare", 2, argv[1] )); 
-  }
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","pn_class_compare", 3, argv[2] )); 
-  }
-  result = pn_class_compare((struct pn_class_t const *)arg1,arg2,arg3);
-  vresult = SWIG_NewPointerObj((intptr_t *)memcpy((intptr_t *)calloc(1,sizeof(intptr_t)),&result,sizeof(intptr_t)), SWIGTYPE_p_intptr_t, SWIG_POINTER_OWN |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_class_equals(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  int res3 ;
-  bool result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_equals", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_class_equals", 2, argv[1] )); 
-  }
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","pn_class_equals", 3, argv[2] )); 
-  }
-  result = (bool)pn_class_equals((struct pn_class_t const *)arg1,arg2,arg3);
-  vresult = SWIG_From_bool((bool)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_class_inspect(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  pn_string_t *arg3 = (pn_string_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_class_inspect", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_class_inspect", 2, argv[1] )); 
-  }
-  res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "pn_string_t *","pn_class_inspect", 3, argv[2] )); 
-  }
-  arg3 = (pn_string_t *)(argp3);
-  result = (int)pn_class_inspect((struct pn_class_t const *)arg1,arg2,arg3);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_void_new(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  size_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t val2 ;
-  int ecode2 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_void_new", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  ecode2 = SWIG_AsVal_size_t(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "size_t","pn_void_new", 2, argv[1] ));
-  } 
-  arg2 = (size_t)(val2);
-  result = (void *)pn_void_new((struct pn_class_t const *)arg1,arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_void_incref(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_incref", 1, argv[0] )); 
-  }
-  pn_void_incref(arg1);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_void_decref(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_decref", 1, argv[0] )); 
-  }
-  pn_void_decref(arg1);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_void_refcount(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_refcount", 1, argv[0] )); 
-  }
-  result = (int)pn_void_refcount(arg1);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_void_hashcode(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  uintptr_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_hashcode", 1, argv[0] )); 
-  }
-  result = (uintptr_t)pn_void_hashcode(arg1);
-  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_void_compare(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  void *arg2 = (void *) 0 ;
-  int res1 ;
-  int res2 ;
-  intptr_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_compare", 1, argv[0] )); 
-  }
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_void_compare", 2, argv[1] )); 
-  }
-  result = pn_void_compare(arg1,arg2);
-  vresult = SWIG_NewPointerObj((intptr_t *)memcpy((intptr_t *)calloc(1,sizeof(intptr_t)),&result,sizeof(intptr_t)), SWIGTYPE_p_intptr_t, SWIG_POINTER_OWN |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_void_inspect(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  pn_string_t *arg2 = (pn_string_t *) 0 ;
-  int res1 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_void_inspect", 1, argv[0] )); 
-  }
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "pn_string_t *","pn_void_inspect", 2, argv[1] )); 
-  }
-  arg2 = (pn_string_t *)(argp2);
-  result = (int)pn_void_inspect(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_object_new(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  size_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t val2 ;
-  int ecode2 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_object_new", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  ecode2 = SWIG_AsVal_size_t(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "size_t","pn_object_new", 2, argv[1] ));
-  } 
-  arg2 = (size_t)(val2);
-  result = (void *)pn_object_new((struct pn_class_t const *)arg1,arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_object_reify(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  pn_class_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_object_reify", 1, argv[0] )); 
-  }
-  result = (pn_class_t *)pn_object_reify(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_class_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_object_incref(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_object_incref", 1, argv[0] )); 
-  }
-  pn_object_incref(arg1);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_object_refcount(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_object_refcount", 1, argv[0] )); 
-  }
-  result = (int)pn_object_refcount(arg1);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_object_decref(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_object_decref", 1, argv[0] )); 
-  }
-  pn_object_decref(arg1);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_object_free(int argc, VALUE *argv, VALUE self) {
+_wrap_pn_incref(int argc, VALUE *argv, VALUE self) {
   void *arg1 = (void *) 0 ;
   int res1 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_object_free", 1, argv[0] )); 
-  }
-  pn_object_free(arg1);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_incref(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_incref", 1, argv[0] )); 
-  }
-  result = (void *)pn_incref(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_decref(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_decref", 1, argv[0] )); 
-  }
-  result = (int)pn_decref(arg1);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_refcount(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_refcount", 1, argv[0] )); 
-  }
-  result = (int)pn_refcount(arg1);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_free(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_free", 1, argv[0] )); 
-  }
-  pn_free(arg1);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_class(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  pn_class_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_class", 1, argv[0] )); 
-  }
-  result = (pn_class_t *)pn_class(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_class_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_hashcode(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  int res1 ;
-  uintptr_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_hashcode", 1, argv[0] )); 
-  }
-  result = (uintptr_t)pn_hashcode(arg1);
-  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_compare(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  void *arg2 = (void *) 0 ;
-  int res1 ;
-  int res2 ;
-  intptr_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_compare", 1, argv[0] )); 
-  }
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_compare", 2, argv[1] )); 
-  }
-  result = pn_compare(arg1,arg2);
-  vresult = SWIG_NewPointerObj((intptr_t *)memcpy((intptr_t *)calloc(1,sizeof(intptr_t)),&result,sizeof(intptr_t)), SWIGTYPE_p_intptr_t, SWIG_POINTER_OWN |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_equals(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  void *arg2 = (void *) 0 ;
-  int res1 ;
-  int res2 ;
-  bool result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_equals", 1, argv[0] )); 
-  }
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_equals", 2, argv[1] )); 
-  }
-  result = (bool)pn_equals(arg1,arg2);
-  vresult = SWIG_From_bool((bool)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_inspect(int argc, VALUE *argv, VALUE self) {
-  void *arg1 = (void *) 0 ;
-  pn_string_t *arg2 = (pn_string_t *) 0 ;
-  int res1 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_inspect", 1, argv[0] )); 
-  }
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "pn_string_t *","pn_inspect", 2, argv[1] )); 
-  }
-  arg2 = (pn_string_t *)(argp2);
-  result = (int)pn_inspect(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  size_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t val2 ;
-  int ecode2 = 0 ;
-  pn_list_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_list", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  ecode2 = SWIG_AsVal_size_t(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "size_t","pn_list", 2, argv[1] ));
-  } 
-  arg2 = (size_t)(val2);
-  result = (pn_list_t *)pn_list((struct pn_class_t const *)arg1,arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_list_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_size(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_size", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  result = (size_t)pn_list_size(arg1);
-  vresult = SWIG_From_size_t((size_t)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_get(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  int arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_get", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","pn_list_get", 2, argv[1] ));
-  } 
-  arg2 = (int)(val2);
-  result = (void *)pn_list_get(arg1,arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_set(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  int arg2 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_set", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","pn_list_set", 2, argv[1] ));
-  } 
-  arg2 = (int)(val2);
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","pn_list_set", 3, argv[2] )); 
-  }
-  pn_list_set(arg1,arg2,arg3);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_add(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_add", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_list_add", 2, argv[1] )); 
-  }
-  result = (int)pn_list_add(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_pop(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_pop", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  result = (void *)pn_list_pop(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_index(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  ssize_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_index", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_list_index", 2, argv[1] )); 
-  }
-  result = (ssize_t)pn_list_index(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_remove(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  bool result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_remove", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_list_remove", 2, argv[1] )); 
-  }
-  result = (bool)pn_list_remove(arg1,arg2);
-  vresult = SWIG_From_bool((bool)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_del(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_del", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","pn_list_del", 2, argv[1] ));
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","pn_list_del", 3, argv[2] ));
-  } 
-  arg3 = (int)(val3);
-  pn_list_del(arg1,arg2,arg3);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_clear(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_clear", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  pn_list_clear(arg1);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_iterator(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  pn_iterator_t *arg2 = (pn_iterator_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_iterator", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_pn_iterator_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "pn_iterator_t *","pn_list_iterator", 2, argv[1] )); 
-  }
-  arg2 = (pn_iterator_t *)(argp2);
-  pn_list_iterator(arg1,arg2);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_minpush(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_minpush", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_list_minpush", 2, argv[1] )); 
-  }
-  pn_list_minpush(arg1,arg2);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_list_minpop(int argc, VALUE *argv, VALUE self) {
-  pn_list_t *arg1 = (pn_list_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_list_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_list_t *","pn_list_minpop", 1, argv[0] )); 
-  }
-  arg1 = (pn_list_t *)(argp1);
-  result = (void *)pn_list_minpop(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_map(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  pn_class_t *arg2 = (pn_class_t *) 0 ;
-  size_t arg3 ;
-  float arg4 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  size_t val3 ;
-  int ecode3 = 0 ;
-  float val4 ;
-  int ecode4 = 0 ;
-  pn_map_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 4) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_map", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "pn_class_t const *","pn_map", 2, argv[1] )); 
-  }
-  arg2 = (pn_class_t *)(argp2);
-  ecode3 = SWIG_AsVal_size_t(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "size_t","pn_map", 3, argv[2] ));
-  } 
-  arg3 = (size_t)(val3);
-  ecode4 = SWIG_AsVal_float(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "float","pn_map", 4, argv[3] ));
-  } 
-  arg4 = (float)(val4);
-  result = (pn_map_t *)pn_map((struct pn_class_t const *)arg1,(struct pn_class_t const *)arg2,arg3,arg4);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_map_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_map_size(int argc, VALUE *argv, VALUE self) {
-  pn_map_t *arg1 = (pn_map_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_map_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_map_t *","pn_map_size", 1, argv[0] )); 
-  }
-  arg1 = (pn_map_t *)(argp1);
-  result = (size_t)pn_map_size(arg1);
-  vresult = SWIG_From_size_t((size_t)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_map_put(int argc, VALUE *argv, VALUE self) {
-  pn_map_t *arg1 = (pn_map_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  int res3 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_map_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_map_t *","pn_map_put", 1, argv[0] )); 
-  }
-  arg1 = (pn_map_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_map_put", 2, argv[1] )); 
-  }
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","pn_map_put", 3, argv[2] )); 
-  }
-  result = (int)pn_map_put(arg1,arg2,arg3);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_map_get(int argc, VALUE *argv, VALUE self) {
-  pn_map_t *arg1 = (pn_map_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_map_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_map_t *","pn_map_get", 1, argv[0] )); 
-  }
-  arg1 = (pn_map_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_map_get", 2, argv[1] )); 
-  }
-  result = (void *)pn_map_get(arg1,arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_map_del(int argc, VALUE *argv, VALUE self) {
-  pn_map_t *arg1 = (pn_map_t *) 0 ;
-  void *arg2 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_map_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_map_t *","pn_map_del", 1, argv[0] )); 
-  }
-  arg1 = (pn_map_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_map_del", 2, argv[1] )); 
-  }
-  pn_map_del(arg1,arg2);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_map_head(int argc, VALUE *argv, VALUE self) {
-  pn_map_t *arg1 = (pn_map_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  pn_handle_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_map_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_map_t *","pn_map_head", 1, argv[0] )); 
-  }
-  arg1 = (pn_map_t *)(argp1);
-  result = (pn_handle_t)pn_map_head(arg1);
-  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_map_next(int argc, VALUE *argv, VALUE self) {
-  pn_map_t *arg1 = (pn_map_t *) 0 ;
-  pn_handle_t arg2 = (pn_handle_t) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned long long val2 ;
-  int ecode2 = 0 ;
-  pn_handle_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_map_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_map_t *","pn_map_next", 1, argv[0] )); 
-  }
-  arg1 = (pn_map_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_map_next", 2, argv[1] ));
-  } 
-  arg2 = (pn_handle_t)(val2);
-  result = (pn_handle_t)pn_map_next(arg1,(void const *)arg2);
-  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_map_key(int argc, VALUE *argv, VALUE self) {
-  pn_map_t *arg1 = (pn_map_t *) 0 ;
-  pn_handle_t arg2 = (pn_handle_t) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned long long val2 ;
-  int ecode2 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_map_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_map_t *","pn_map_key", 1, argv[0] )); 
-  }
-  arg1 = (pn_map_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_map_key", 2, argv[1] ));
-  } 
-  arg2 = (pn_handle_t)(val2);
-  result = (void *)pn_map_key(arg1,(void const *)arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_map_value(int argc, VALUE *argv, VALUE self) {
-  pn_map_t *arg1 = (pn_map_t *) 0 ;
-  pn_handle_t arg2 = (pn_handle_t) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned long long val2 ;
-  int ecode2 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_map_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_map_t *","pn_map_value", 1, argv[0] )); 
-  }
-  arg1 = (pn_map_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_map_value", 2, argv[1] ));
-  } 
-  arg2 = (pn_handle_t)(val2);
-  result = (void *)pn_map_value(arg1,(void const *)arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_hash(int argc, VALUE *argv, VALUE self) {
-  pn_class_t *arg1 = (pn_class_t *) 0 ;
-  size_t arg2 ;
-  float arg3 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t val2 ;
-  int ecode2 = 0 ;
-  float val3 ;
-  int ecode3 = 0 ;
-  pn_hash_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_class_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_class_t const *","pn_hash", 1, argv[0] )); 
-  }
-  arg1 = (pn_class_t *)(argp1);
-  ecode2 = SWIG_AsVal_size_t(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "size_t","pn_hash", 2, argv[1] ));
-  } 
-  arg2 = (size_t)(val2);
-  ecode3 = SWIG_AsVal_float(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "float","pn_hash", 3, argv[2] ));
-  } 
-  arg3 = (float)(val3);
-  result = (pn_hash_t *)pn_hash((struct pn_class_t const *)arg1,arg2,arg3);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_hash_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_hash_size(int argc, VALUE *argv, VALUE self) {
-  pn_hash_t *arg1 = (pn_hash_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_hash_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_hash_t *","pn_hash_size", 1, argv[0] )); 
-  }
-  arg1 = (pn_hash_t *)(argp1);
-  result = (size_t)pn_hash_size(arg1);
-  vresult = SWIG_From_size_t((size_t)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_hash_put(int argc, VALUE *argv, VALUE self) {
-  pn_hash_t *arg1 = (pn_hash_t *) 0 ;
-  uintptr_t arg2 ;
-  void *arg3 = (void *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned long long val2 ;
-  int ecode2 = 0 ;
-  int res3 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_hash_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_hash_t *","pn_hash_put", 1, argv[0] )); 
-  }
-  arg1 = (pn_hash_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "uintptr_t","pn_hash_put", 2, argv[1] ));
-  } 
-  arg2 = (uintptr_t)(val2);
-  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","pn_hash_put", 3, argv[2] )); 
-  }
-  result = (int)pn_hash_put(arg1,arg2,arg3);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_hash_get(int argc, VALUE *argv, VALUE self) {
-  pn_hash_t *arg1 = (pn_hash_t *) 0 ;
-  uintptr_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned long long val2 ;
-  int ecode2 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_hash_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_hash_t *","pn_hash_get", 1, argv[0] )); 
-  }
-  arg1 = (pn_hash_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "uintptr_t","pn_hash_get", 2, argv[1] ));
-  } 
-  arg2 = (uintptr_t)(val2);
-  result = (void *)pn_hash_get(arg1,arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_hash_del(int argc, VALUE *argv, VALUE self) {
-  pn_hash_t *arg1 = (pn_hash_t *) 0 ;
-  uintptr_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned long long val2 ;
-  int ecode2 = 0 ;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_hash_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_hash_t *","pn_hash_del", 1, argv[0] )); 
-  }
-  arg1 = (pn_hash_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "uintptr_t","pn_hash_del", 2, argv[1] ));
-  } 
-  arg2 = (uintptr_t)(val2);
-  pn_hash_del(arg1,arg2);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_hash_head(int argc, VALUE *argv, VALUE self) {
-  pn_hash_t *arg1 = (pn_hash_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  pn_handle_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_hash_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_hash_t *","pn_hash_head", 1, argv[0] )); 
-  }
-  arg1 = (pn_hash_t *)(argp1);
-  result = (pn_handle_t)pn_hash_head(arg1);
-  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_hash_next(int argc, VALUE *argv, VALUE self) {
-  pn_hash_t *arg1 = (pn_hash_t *) 0 ;
-  pn_handle_t arg2 = (pn_handle_t) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned long long val2 ;
-  int ecode2 = 0 ;
-  pn_handle_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_hash_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_hash_t *","pn_hash_next", 1, argv[0] )); 
-  }
-  arg1 = (pn_hash_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_hash_next", 2, argv[1] ));
-  } 
-  arg2 = (pn_handle_t)(val2);
-  result = (pn_handle_t)pn_hash_next(arg1,(void const *)arg2);
-  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_hash_key(int argc, VALUE *argv, VALUE self) {
-  pn_hash_t *arg1 = (pn_hash_t *) 0 ;
-  pn_handle_t arg2 = (pn_handle_t) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned long long val2 ;
-  int ecode2 = 0 ;
-  uintptr_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_hash_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_hash_t *","pn_hash_key", 1, argv[0] )); 
-  }
-  arg1 = (pn_hash_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_hash_key", 2, argv[1] ));
-  } 
-  arg2 = (pn_handle_t)(val2);
-  result = (uintptr_t)pn_hash_key(arg1,(void const *)arg2);
-  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_hash_value(int argc, VALUE *argv, VALUE self) {
-  pn_hash_t *arg1 = (pn_hash_t *) 0 ;
-  pn_handle_t arg2 = (pn_handle_t) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned long long val2 ;
-  int ecode2 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_hash_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_hash_t *","pn_hash_value", 1, argv[0] )); 
-  }
-  arg1 = (pn_hash_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_hash_value", 2, argv[1] ));
-  } 
-  arg2 = (pn_handle_t)(val2);
-  result = (void *)pn_hash_value(arg1,(void const *)arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string(int argc, VALUE *argv, VALUE self) {
-  char *arg1 = (char *) 0 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
-  pn_string_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","pn_string", 1, argv[0] ));
-  }
-  arg1 = (char *)(buf1);
-  result = (pn_string_t *)pn_string((char const *)arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return vresult;
-fail:
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_stringn(int argc, VALUE *argv, VALUE self) {
-  char *arg1 = (char *) 0 ;
-  size_t arg2 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
-  size_t val2 ;
-  int ecode2 = 0 ;
-  pn_string_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","pn_stringn", 1, argv[0] ));
-  }
-  arg1 = (char *)(buf1);
-  ecode2 = SWIG_AsVal_size_t(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "size_t","pn_stringn", 2, argv[1] ));
-  } 
-  arg2 = (size_t)(val2);
-  result = (pn_string_t *)pn_stringn((char const *)arg1,arg2);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return vresult;
-fail:
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_get(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_get", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  result = (char *)pn_string_get(arg1);
-  vresult = SWIG_FromCharPtr((const char *)result);
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_size(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_size", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  result = (size_t)pn_string_size(arg1);
-  vresult = SWIG_From_size_t((size_t)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_set(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_set", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","pn_string_set", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  result = (int)pn_string_set(arg1,(char const *)arg2);
-  vresult = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return vresult;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_setn(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  size_t arg3 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  size_t val3 ;
-  int ecode3 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_setn", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","pn_string_setn", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  ecode3 = SWIG_AsVal_size_t(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "size_t","pn_string_setn", 3, argv[2] ));
-  } 
-  arg3 = (size_t)(val3);
-  result = (int)pn_string_setn(arg1,(char const *)arg2,arg3);
-  vresult = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return vresult;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_put(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  ssize_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_put", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","pn_string_put", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  result = (ssize_t)pn_string_put(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return vresult;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_clear(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_clear", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  pn_string_clear(arg1);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_format(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if (argc < 2) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_format", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","pn_string_format", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  result = (int)pn_string_format(arg1,(char const *)arg2,arg3);
-  vresult = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return vresult;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_addf(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *arg3 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if (argc < 2) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_addf", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","pn_string_addf", 2, argv[1] ));
-  }
-  arg2 = (char *)(buf2);
-  result = (int)pn_string_addf(arg1,(char const *)arg2,arg3);
-  vresult = SWIG_From_int((int)(result));
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return vresult;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_grow(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  size_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t val2 ;
-  int ecode2 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_grow", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  ecode2 = SWIG_AsVal_size_t(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "size_t","pn_string_grow", 2, argv[1] ));
-  } 
-  arg2 = (size_t)(val2);
-  result = (int)pn_string_grow(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_buffer(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_buffer", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  result = (char *)pn_string_buffer(arg1);
-  vresult = SWIG_FromCharPtr((const char *)result);
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_capacity(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_capacity", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  result = (size_t)pn_string_capacity(arg1);
-  vresult = SWIG_From_size_t((size_t)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_pn_string_resize(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  size_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t val2 ;
-  int ecode2 = 0 ;
-  int result;
+  void *result = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_resize", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_incref", 1, argv[0] )); 
   }
-  arg1 = (pn_string_t *)(argp1);
-  ecode2 = SWIG_AsVal_size_t(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "size_t","pn_string_resize", 2, argv[1] ));
-  } 
-  arg2 = (size_t)(val2);
-  result = (int)pn_string_resize(arg1,arg2);
-  vresult = SWIG_From_int((int)(result));
+  result = (void *)pn_incref(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -6436,30 +4380,20 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_string_copy(int argc, VALUE *argv, VALUE self) {
-  pn_string_t *arg1 = (pn_string_t *) 0 ;
-  pn_string_t *arg2 = (pn_string_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
+_wrap_pn_decref(int argc, VALUE *argv, VALUE self) {
+  void *arg1 = (void *) 0 ;
+  int res1 ;
   int result;
   VALUE vresult = Qnil;
   
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_string_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_copy", 1, argv[0] )); 
-  }
-  arg1 = (pn_string_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_pn_string_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "pn_string_t *","pn_string_copy", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_decref", 1, argv[0] )); 
   }
-  arg2 = (pn_string_t *)(argp2);
-  result = (int)pn_string_copy(arg1,arg2);
+  result = (int)pn_decref(arg1);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -6468,15 +4402,21 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_iterator(int argc, VALUE *argv, VALUE self) {
-  pn_iterator_t *result = 0 ;
+_wrap_pn_refcount(int argc, VALUE *argv, VALUE self) {
+  void *arg1 = (void *) 0 ;
+  int res1 ;
+  int result;
   VALUE vresult = Qnil;
   
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_refcount", 1, argv[0] )); 
   }
-  result = (pn_iterator_t *)pn_iterator();
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_iterator_t, 0 |  0 );
+  result = (int)pn_refcount(arg1);
+  vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
   return Qnil;
@@ -6484,68 +4424,64 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pn_iterator_start(int argc, VALUE *argv, VALUE self) {
-  pn_iterator_t *arg1 = (pn_iterator_t *) 0 ;
-  pn_iterator_next_t arg2 = (pn_iterator_next_t) 0 ;
-  size_t arg3 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t val3 ;
-  int ecode3 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
+_wrap_pn_free(int argc, VALUE *argv, VALUE self) {
+  void *arg1 = (void *) 0 ;
+  int res1 ;
   
-  if ((argc < 3) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_iterator_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_iterator_t *","pn_iterator_start", 1, argv[0] )); 
-  }
-  arg1 = (pn_iterator_t *)(argp1);
-  {
-    int res = SWIG_ConvertFunctionPtr(argv[1], (void**)(&arg2), SWIGTYPE_p_f_p_void__p_void);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "pn_iterator_next_t","pn_iterator_start", 2, argv[1] )); 
-    }
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_free", 1, argv[0] )); 
   }
-  ecode3 = SWIG_AsVal_size_t(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "size_t","pn_iterator_start", 3, argv[2] ));
-  } 
-  arg3 = (size_t)(val3);
-  result = (void *)pn_iterator_start(arg1,arg2,arg3);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
+  pn_free(arg1);
+  return Qnil;
 fail:
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
-_wrap_pn_iterator_next(int argc, VALUE *argv, VALUE self) {
-  pn_iterator_t *arg1 = (pn_iterator_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *result = 0 ;
+_wrap_pn_tostring(int argc, VALUE *argv, VALUE self) {
+  void *arg1 = (void *) 0 ;
+  int res1 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_iterator_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_iterator_t *","pn_iterator_next", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void *","pn_tostring", 1, argv[0] )); 
   }
-  arg1 = (pn_iterator_t *)(argp1);
-  result = (void *)pn_iterator_next(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  result = (char *)pn_tostring(arg1);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
 }
 
 
+SWIGINTERN VALUE
+_wrap_PN_OBJECT_get(VALUE self) {
+  VALUE _val;
+  
+  _val = SWIG_NewPointerObj(SWIG_as_voidptr(PN_OBJECT), SWIGTYPE_p_pn_class_t,  0 );
+  return _val;
+}
+
+
+SWIGINTERN VALUE
+_wrap_PN_VOID_get(VALUE self) {
+  VALUE _val;
+  
+  _val = SWIG_NewPointerObj(SWIG_as_voidptr(PN_VOID), SWIGTYPE_p_pn_class_t,  0 );
+  return _val;
+}
+
+
 SWIGINTERN VALUE
 _wrap_pn_record(int argc, VALUE *argv, VALUE self) {
   pn_record_t *result = 0 ;
@@ -6569,7 +4505,7 @@ _wrap_pn_record_def(int argc, VALUE *argv, VALUE self) {
   pn_class_t *arg3 = (pn_class_t *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  unsigned long long val2 ;
+  long val2 ;
   int ecode2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
@@ -6582,7 +4518,7 @@ _wrap_pn_record_def(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_record_t *","pn_record_def", 1, argv[0] )); 
   }
   arg1 = (pn_record_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
+  ecode2 = SWIG_AsVal_long(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_record_def", 2, argv[1] ));
   } 
@@ -6605,7 +4541,7 @@ _wrap_pn_record_has(int argc, VALUE *argv, VALUE self) {
   pn_handle_t arg2 = (pn_handle_t) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  unsigned long long val2 ;
+  long val2 ;
   int ecode2 = 0 ;
   bool result;
   VALUE vresult = Qnil;
@@ -6618,7 +4554,7 @@ _wrap_pn_record_has(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_record_t *","pn_record_has", 1, argv[0] )); 
   }
   arg1 = (pn_record_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
+  ecode2 = SWIG_AsVal_long(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_record_has", 2, argv[1] ));
   } 
@@ -6637,7 +4573,7 @@ _wrap_pn_record_get(int argc, VALUE *argv, VALUE self) {
   pn_handle_t arg2 = (pn_handle_t) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  unsigned long long val2 ;
+  long val2 ;
   int ecode2 = 0 ;
   void *result = 0 ;
   VALUE vresult = Qnil;
@@ -6650,7 +4586,7 @@ _wrap_pn_record_get(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_record_t *","pn_record_get", 1, argv[0] )); 
   }
   arg1 = (pn_record_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
+  ecode2 = SWIG_AsVal_long(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_record_get", 2, argv[1] ));
   } 
@@ -6670,7 +4606,7 @@ _wrap_pn_record_set(int argc, VALUE *argv, VALUE self) {
   void *arg3 = (void *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  unsigned long long val2 ;
+  long val2 ;
   int ecode2 = 0 ;
   int res3 ;
   
@@ -6682,7 +4618,7 @@ _wrap_pn_record_set(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_record_t *","pn_record_set", 1, argv[0] )); 
   }
   arg1 = (pn_record_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
+  ecode2 = SWIG_AsVal_long(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_record_set", 2, argv[1] ));
   } 
@@ -8511,6 +6447,118 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_pn_session_incoming_window(int argc, VALUE *argv, VALUE self) {
+  pn_session_t *arg1 = (pn_session_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  pn_frame_count_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_session_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_session_t *","pn_session_incoming_window", 1, argv[0] )); 
+  }
+  arg1 = (pn_session_t *)(argp1);
+  result = (pn_frame_count_t)pn_session_incoming_window(arg1);
+  vresult = SWIG_From_unsigned_SS_long((unsigned long)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_session_incoming_window_lwm(int argc, VALUE *argv, VALUE self) {
+  pn_session_t *arg1 = (pn_session_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  pn_frame_count_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_session_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_session_t *","pn_session_incoming_window_lwm", 1, argv[0] )); 
+  }
+  arg1 = (pn_session_t *)(argp1);
+  result = (pn_frame_count_t)pn_session_incoming_window_lwm(arg1);
+  vresult = SWIG_From_unsigned_SS_long((unsigned long)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_session_set_incoming_window_and_lwm(int argc, VALUE *argv, VALUE self) {
+  pn_session_t *arg1 = (pn_session_t *) 0 ;
+  pn_frame_count_t arg2 ;
+  pn_frame_count_t arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned long val2 ;
+  int ecode2 = 0 ;
+  unsigned long val3 ;
+  int ecode3 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_session_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_session_t *","pn_session_set_incoming_window_and_lwm", 1, argv[0] )); 
+  }
+  arg1 = (pn_session_t *)(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_long(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_frame_count_t","pn_session_set_incoming_window_and_lwm", 2, argv[1] ));
+  } 
+  arg2 = (pn_frame_count_t)(val2);
+  ecode3 = SWIG_AsVal_unsigned_SS_long(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "pn_frame_count_t","pn_session_set_incoming_window_and_lwm", 3, argv[2] ));
+  } 
+  arg3 = (pn_frame_count_t)(val3);
+  result = (int)pn_session_set_incoming_window_and_lwm(arg1,arg2,arg3);
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_pn_session_remote_incoming_window(int argc, VALUE *argv, VALUE self) {
+  pn_session_t *arg1 = (pn_session_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  pn_frame_count_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_session_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_session_t *","pn_session_remote_incoming_window", 1, argv[0] )); 
+  }
+  arg1 = (pn_session_t *)(argp1);
+  result = (pn_frame_count_t)pn_session_remote_incoming_window(arg1);
+  vresult = SWIG_From_unsigned_SS_long((unsigned long)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_pn_session_get_outgoing_window(int argc, VALUE *argv, VALUE self) {
   pn_session_t *arg1 = (pn_session_t *) 0 ;
@@ -12888,6 +10936,44 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_pn_collector_put_object(int argc, VALUE *argv, VALUE self) {
+  pn_collector_t *arg1 = (pn_collector_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  pn_event_type_t arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  pn_event_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_pn_collector_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_collector_t *","pn_collector_put_object", 1, argv[0] )); 
+  }
+  arg1 = (pn_collector_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","pn_collector_put_object", 2, argv[1] )); 
+  }
+  ecode3 = SWIG_AsVal_int(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "pn_event_type_t","pn_collector_put_object", 3, argv[2] ));
+  } 
+  arg3 = (pn_event_type_t)(val3);
+  result = (pn_event_t *)pn_collector_put_object(arg1,arg2,arg3);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pn_event_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_pn_collector_peek(int argc, VALUE *argv, VALUE self) {
   pn_collector_t *arg1 = (pn_collector_t *) 0 ;
@@ -18147,7 +16233,7 @@ _wrap_pn_data_point(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (pn_data_t *)(argp1);
   result = (pn_handle_t)pn_data_point(arg1);
-  vresult = SWIG_From_unsigned_SS_long_SS_long((unsigned long long)(result));
+  vresult = SWIG_From_long((long)(result));
   return vresult;
 fail:
   return Qnil;
@@ -18160,7 +16246,7 @@ _wrap_pn_data_restore(int argc, VALUE *argv, VALUE self) {
   pn_handle_t arg2 = (pn_handle_t) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  unsigned long long val2 ;
+  long val2 ;
   int ecode2 = 0 ;
   bool result;
   VALUE vresult = Qnil;
@@ -18173,7 +16259,7 @@ _wrap_pn_data_restore(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "pn_data_t *","pn_data_restore", 1, argv[0] )); 
   }
   arg1 = (pn_data_t *)(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_long_SS_long(argv[1], &val2);
+  ecode2 = SWIG_AsVal_long(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "pn_handle_t","pn_data_restore", 2, argv[1] ));
   } 
@@ -19305,72 +17391,67 @@ fail:
 static swig_type_info _swigt__p_Pn_rbkey_t = {"_p_Pn_rbkey_t", "Pn_rbkey_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Pni_rbhandler_t = {"_p_Pni_rbhandler_t", "Pni_rbhandler_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_struct_pn_transport_t_p_q_const__char__void = {"_p_f_p_struct_pn_transport_t_p_q_const__char__void", "void (*)(struct pn_transport_t *,char const *)|pn_tracer_t", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_f_p_void__p_void = {"_p_f_p_void__p_void", "void *(*)(void *)|pn_iterator_next_t", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_int = {"_p_int", "int *|ssize_t *|pn_state_t *|pn_trace_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_intptr_t = {"_p_intptr_t", "intptr_t *|pn_shandle_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_long = {"_p_long", "int32_t *|long *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_long_long = {"_p_long_long", "int64_t *|long long *|pn_timestamp_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_struct_pn_transport_t_p_q_const__char__void = {"_p_f_p_struct_pn_transport_t_p_q_const__char__void", "pn_tracer_t|void (*)(struct pn_transport_t *,char const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void__int = {"_p_f_p_void__int", "int (*)(void *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void__void = {"_p_f_p_void__void", "void (*)(void *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_int = {"_p_int", "pn_state_t *|pn_trace_t *|ssize_t *|int *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_long = {"_p_long", "int32_t *|intptr_t *|long *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_long_long = {"_p_long_long", "int64_t *|pn_timestamp_t *|long long *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_pn_connection_driver_t = {"_p_p_pn_connection_driver_t", "struct pn_connection_driver_t **|pn_connection_driver_t **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_atom_t = {"_p_pn_atom_t", "pn_atom_t *|pn_msgid_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_bytes_t = {"_p_pn_bytes_t", "struct pn_bytes_t *|pn_bytes_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_cid_t = {"_p_pn_cid_t", "enum pn_cid_t *|pn_cid_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_class_t = {"_p_pn_class_t", "struct pn_class_t *|pn_class_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_collector_t = {"_p_pn_collector_t", "struct pn_collector_t *|pn_collector_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_condition_t = {"_p_pn_condition_t", "struct pn_condition_t *|pn_condition_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_connection_driver_t = {"_p_pn_connection_driver_t", "struct pn_connection_driver_t *|pn_connection_driver_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_connection_t = {"_p_pn_connection_t", "struct pn_connection_t *|pn_connection_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_data_t = {"_p_pn_data_t", "struct pn_data_t *|pn_data_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_pn_connection_driver_t = {"_p_p_pn_connection_driver_t", "pn_connection_driver_t **|struct pn_connection_driver_t **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_atom_t = {"_p_pn_atom_t", "pn_msgid_t *|pn_atom_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_bytes_t = {"_p_pn_bytes_t", "pn_bytes_t *|struct pn_bytes_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_cid_t = {"_p_pn_cid_t", "pn_cid_t *|enum pn_cid_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_class_t = {"_p_pn_class_t", "pn_class_t *|struct pn_class_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_collector_t = {"_p_pn_collector_t", "pn_collector_t *|struct pn_collector_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_condition_t = {"_p_pn_condition_t", "pn_condition_t *|struct pn_condition_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_connection_driver_t = {"_p_pn_connection_driver_t", "pn_connection_driver_t *|struct pn_connection_driver_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_connection_t = {"_p_pn_connection_t", "pn_connection_t *|struct pn_connection_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_data_t = {"_p_pn_data_t", "pn_data_t *|struct pn_data_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_decimal128_t = {"_p_pn_decimal128_t", "pn_decimal128_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_delivery_t = {"_p_pn_delivery_t", "struct pn_delivery_t *|pn_delivery_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_disposition_t = {"_p_pn_disposition_t", "struct pn_disposition_t *|pn_disposition_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_distribution_mode_t = {"_p_pn_distribution_mode_t", "enum pn_distribution_mode_t *|pn_distribution_mode_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_durability_t = {"_p_pn_durability_t", "enum pn_durability_t *|pn_durability_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_error_t = {"_p_pn_error_t", "struct pn_error_t *|pn_error_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_event_t = {"_p_pn_event_t", "struct pn_event_t *|pn_event_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_event_type_t = {"_p_pn_event_type_t", "enum pn_event_type_t *|pn_event_type_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_expiry_policy_t = {"_p_pn_expiry_policy_t", "enum pn_expiry_policy_t *|pn_expiry_policy_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_handler_t = {"_p_pn_handler_t", "struct pn_handler_t *|pn_handler_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_hash_t = {"_p_pn_hash_t", "struct pn_hash_t *|pn_hash_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_iterator_t = {"_p_pn_iterator_t", "struct pn_iterator_t *|pn_iterator_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_link_t = {"_p_pn_link_t", "struct pn_link_t *|pn_link_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_list_t = {"_p_pn_list_t", "struct pn_list_t *|pn_list_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_listener_t = {"_p_pn_listener_t", "struct pn_listener_t *|pn_listener_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_delivery_t = {"_p_pn_delivery_t", "pn_delivery_t *|struct pn_delivery_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_disposition_t = {"_p_pn_disposition_t", "pn_disposition_t *|struct pn_disposition_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_distribution_mode_t = {"_p_pn_distribution_mode_t", "pn_distribution_mode_t *|enum pn_distribution_mode_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_durability_t = {"_p_pn_durability_t", "pn_durability_t *|enum pn_durability_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_error_t = {"_p_pn_error_t", "pn_error_t *|struct pn_error_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_event_t = {"_p_pn_event_t", "pn_event_t *|struct pn_event_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_event_type_t = {"_p_pn_event_type_t", "pn_event_type_t *|enum pn_event_type_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_expiry_policy_t = {"_p_pn_expiry_policy_t", "pn_expiry_policy_t *|enum pn_expiry_policy_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_handler_t = {"_p_pn_handler_t", "pn_handler_t *|struct pn_handler_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_link_t = {"_p_pn_link_t", "pn_link_t *|struct pn_link_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_listener_t = {"_p_pn_listener_t", "pn_listener_t *|struct pn_listener_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_logger_t = {"_p_pn_logger_t", "pn_logger_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_map_t = {"_p_pn_map_t", "struct pn_map_t *|pn_map_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_message_t = {"_p_pn_message_t", "struct pn_message_t *|pn_message_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_message_t = {"_p_pn_message_t", "pn_message_t *|struct pn_message_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_messenger_t = {"_p_pn_messenger_t", "pn_messenger_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_proactor_t = {"_p_pn_proactor_t", "struct pn_proactor_t *|pn_proactor_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_raw_connection_t = {"_p_pn_raw_connection_t", "struct pn_raw_connection_t *|pn_raw_connection_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_rcv_settle_mode_t = {"_p_pn_rcv_settle_mode_t", "enum pn_rcv_settle_mode_t *|pn_rcv_settle_mode_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_record_t = {"_p_pn_record_t", "struct pn_record_t *|pn_record_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_rwbytes_t = {"_p_pn_rwbytes_t", "struct pn_rwbytes_t *|pn_rwbytes_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_sasl_outcome_t = {"_p_pn_sasl_outcome_t", "enum pn_sasl_outcome_t *|pn_sasl_outcome_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_sasl_t = {"_p_pn_sasl_t", "struct pn_sasl_t *|pn_sasl_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_session_t = {"_p_pn_session_t", "struct pn_session_t *|pn_session_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_snd_settle_mode_t = {"_p_pn_snd_settle_mode_t", "enum pn_snd_settle_mode_t *|pn_snd_settle_mode_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_ssl_cert_subject_subfield = {"_p_pn_ssl_cert_subject_subfield", "enum pn_ssl_cert_subject_subfield *|pn_ssl_cert_subject_subfield *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_ssl_domain_t = {"_p_pn_ssl_domain_t", "struct pn_ssl_domain_t *|pn_ssl_domain_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_ssl_hash_alg = {"_p_pn_ssl_hash_alg", "enum pn_ssl_hash_alg *|pn_ssl_hash_alg *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_ssl_mode_t = {"_p_pn_ssl_mode_t", "enum pn_ssl_mode_t *|pn_ssl_mode_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_ssl_resume_status_t = {"_p_pn_ssl_resume_status_t", "enum pn_ssl_resume_status_t *|pn_ssl_resume_status_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_ssl_t = {"_p_pn_ssl_t", "struct pn_ssl_t *|pn_ssl_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_ssl_verify_mode_t = {"_p_pn_ssl_verify_mode_t", "enum pn_ssl_verify_mode_t *|pn_ssl_verify_mode_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_string_t = {"_p_pn_string_t", "struct pn_string_t *|pn_string_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_terminus_t = {"_p_pn_terminus_t", "struct pn_terminus_t *|pn_terminus_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_terminus_type_t = {"_p_pn_terminus_type_t", "enum pn_terminus_type_t *|pn_terminus_type_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_transport_t = {"_p_pn_transport_t", "struct pn_transport_t *|pn_transport_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_type_t = {"_p_pn_type_t", "enum pn_type_t *|pn_type_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_pn_url_t = {"_p_pn_url_t", "struct pn_url_t *|pn_url_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_proactor_t = {"_p_pn_proactor_t", "pn_proactor_t *|struct pn_proactor_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_raw_connection_t = {"_p_pn_raw_connection_t", "pn_raw_connection_t *|struct pn_raw_connection_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_rcv_settle_mode_t = {"_p_pn_rcv_settle_mode_t", "pn_rcv_settle_mode_t *|enum pn_rcv_settle_mode_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_record_t = {"_p_pn_record_t", "pn_record_t *|struct pn_record_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_rwbytes_t = {"_p_pn_rwbytes_t", "pn_rwbytes_t *|struct pn_rwbytes_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_sasl_outcome_t = {"_p_pn_sasl_outcome_t", "pn_sasl_outcome_t *|enum pn_sasl_outcome_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_sasl_t = {"_p_pn_sasl_t", "pn_sasl_t *|struct pn_sasl_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_session_t = {"_p_pn_session_t", "pn_session_t *|struct pn_session_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_snd_settle_mode_t = {"_p_pn_snd_settle_mode_t", "pn_snd_settle_mode_t *|enum pn_snd_settle_mode_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_ssl_cert_subject_subfield = {"_p_pn_ssl_cert_subject_subfield", "pn_ssl_cert_subject_subfield *|enum pn_ssl_cert_subject_subfield *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_ssl_domain_t = {"_p_pn_ssl_domain_t", "pn_ssl_domain_t *|struct pn_ssl_domain_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_ssl_hash_alg = {"_p_pn_ssl_hash_alg", "pn_ssl_hash_alg *|enum pn_ssl_hash_alg *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_ssl_mode_t = {"_p_pn_ssl_mode_t", "pn_ssl_mode_t *|enum pn_ssl_mode_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_ssl_resume_status_t = {"_p_pn_ssl_resume_status_t", "pn_ssl_resume_status_t *|enum pn_ssl_resume_status_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_ssl_t = {"_p_pn_ssl_t", "pn_ssl_t *|struct pn_ssl_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_ssl_verify_mode_t = {"_p_pn_ssl_verify_mode_t", "pn_ssl_verify_mode_t *|enum pn_ssl_verify_mode_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_terminus_t = {"_p_pn_terminus_t", "pn_terminus_t *|struct pn_terminus_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_terminus_type_t = {"_p_pn_terminus_type_t", "pn_terminus_type_t *|enum pn_terminus_type_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_transport_t = {"_p_pn_transport_t", "pn_transport_t *|struct pn_transport_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_type_t = {"_p_pn_type_t", "pn_type_t *|enum pn_type_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_pn_url_t = {"_p_pn_url_t", "pn_url_t *|struct pn_url_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_pn_uuid_t = {"_p_pn_uuid_t", "pn_uuid_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_short = {"_p_short", "short *|int16_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|int8_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|uint8_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_short = {"_p_short", "int16_t *|short *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "int8_t *|signed char *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "uint8_t *|unsigned char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "size_t *|unsigned int *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "pn_seconds_t *|pn_decimal32_t *|uint32_t *|unsigned long *|pn_millis_t *|pn_char_t *|pn_sequence_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "uintptr_t *|pn_decimal64_t *|uint64_t *|unsigned long long *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|uint16_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "pn_char_t *|pn_decimal32_t *|pn_frame_count_t *|pn_millis_t *|pn_seconds_t *|pn_sequence_t *|uint32_t *|unsigned long *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "pn_decimal64_t *|uint64_t *|unsigned long long *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "uint16_t *|unsigned short *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
@@ -19378,9 +17459,9 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_Pni_rbhandler_t,
   &_swigt__p_char,
   &_swigt__p_f_p_struct_pn_transport_t_p_q_const__char__void,
-  &_swigt__p_f_p_void__p_void,
+  &_swigt__p_f_p_void__int,
+  &_swigt__p_f_p_void__void,
   &_swigt__p_int,
-  &_swigt__p_intptr_t,
   &_swigt__p_long,
   &_swigt__p_long_long,
   &_swigt__p_p_char,
@@ -19404,13 +17485,9 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_pn_event_type_t,
   &_swigt__p_pn_expiry_policy_t,
   &_swigt__p_pn_handler_t,
-  &_swigt__p_pn_hash_t,
-  &_swigt__p_pn_iterator_t,
   &_swigt__p_pn_link_t,
-  &_swigt__p_pn_list_t,
   &_swigt__p_pn_listener_t,
   &_swigt__p_pn_logger_t,
-  &_swigt__p_pn_map_t,
   &_swigt__p_pn_message_t,
   &_swigt__p_pn_messenger_t,
   &_swigt__p_pn_proactor_t,
@@ -19429,7 +17506,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_pn_ssl_resume_status_t,
   &_swigt__p_pn_ssl_t,
   &_swigt__p_pn_ssl_verify_mode_t,
-  &_swigt__p_pn_string_t,
   &_swigt__p_pn_terminus_t,
   &_swigt__p_pn_terminus_type_t,
   &_swigt__p_pn_transport_t,
@@ -19450,9 +17526,9 @@ static swig_cast_info _swigc__p_Pn_rbkey_t[] = {  {&_swigt__p_Pn_rbkey_t, 0, 0,
 static swig_cast_info _swigc__p_Pni_rbhandler_t[] = {  {&_swigt__p_Pni_rbhandler_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_struct_pn_transport_t_p_q_const__char__void[] = {  {&_swigt__p_f_p_struct_pn_transport_t_p_q_const__char__void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_f_p_void__p_void[] = {  {&_swigt__p_f_p_void__p_void, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void__int[] = {  {&_swigt__p_f_p_void__int, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void__void[] = {  {&_swigt__p_f_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_intptr_t[] = {  {&_swigt__p_intptr_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_long[] = {  {&_swigt__p_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_long_long[] = {  {&_swigt__p_long_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
@@ -19476,13 +17552,9 @@ static swig_cast_info _swigc__p_pn_event_t[] = {  {&_swigt__p_pn_event_t, 0, 0,
 static swig_cast_info _swigc__p_pn_event_type_t[] = {  {&_swigt__p_pn_event_type_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_expiry_policy_t[] = {  {&_swigt__p_pn_expiry_policy_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_handler_t[] = {  {&_swigt__p_pn_handler_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_pn_hash_t[] = {  {&_swigt__p_pn_hash_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_pn_iterator_t[] = {  {&_swigt__p_pn_iterator_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_link_t[] = {  {&_swigt__p_pn_link_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_pn_list_t[] = {  {&_swigt__p_pn_list_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_listener_t[] = {  {&_swigt__p_pn_listener_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_logger_t[] = {  {&_swigt__p_pn_logger_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_pn_map_t[] = {  {&_swigt__p_pn_map_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_message_t[] = {  {&_swigt__p_pn_message_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_messenger_t[] = {  {&_swigt__p_pn_messenger_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_proactor_t[] = {  {&_swigt__p_pn_proactor_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -19501,7 +17573,6 @@ static swig_cast_info _swigc__p_pn_ssl_mode_t[] = {  {&_swigt__p_pn_ssl_mode_t,
 static swig_cast_info _swigc__p_pn_ssl_resume_status_t[] = {  {&_swigt__p_pn_ssl_resume_status_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_ssl_t[] = {  {&_swigt__p_pn_ssl_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_ssl_verify_mode_t[] = {  {&_swigt__p_pn_ssl_verify_mode_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_pn_string_t[] = {  {&_swigt__p_pn_string_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_terminus_t[] = {  {&_swigt__p_pn_terminus_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_terminus_type_t[] = {  {&_swigt__p_pn_terminus_type_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_pn_transport_t[] = {  {&_swigt__p_pn_transport_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -19522,9 +17593,9 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_Pni_rbhandler_t,
   _swigc__p_char,
   _swigc__p_f_p_struct_pn_transport_t_p_q_const__char__void,
-  _swigc__p_f_p_void__p_void,
+  _swigc__p_f_p_void__int,
+  _swigc__p_f_p_void__void,
   _swigc__p_int,
-  _swigc__p_intptr_t,
   _swigc__p_long,
   _swigc__p_long_long,
   _swigc__p_p_char,
@@ -19548,13 +17619,9 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_pn_event_type_t,
   _swigc__p_pn_expiry_policy_t,
   _swigc__p_pn_handler_t,
-  _swigc__p_pn_hash_t,
-  _swigc__p_pn_iterator_t,
   _swigc__p_pn_link_t,
-  _swigc__p_pn_list_t,
   _swigc__p_pn_listener_t,
   _swigc__p_pn_logger_t,
-  _swigc__p_pn_map_t,
   _swigc__p_pn_message_t,
   _swigc__p_pn_messenger_t,
   _swigc__p_pn_proactor_t,
@@ -19573,7 +17640,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_pn_ssl_resume_status_t,
   _swigc__p_pn_ssl_t,
   _swigc__p_pn_ssl_verify_mode_t,
-  _swigc__p_pn_string_t,
   _swigc__p_pn_terminus_t,
   _swigc__p_pn_terminus_type_t,
   _swigc__p_pn_transport_t,
@@ -19645,9 +17711,12 @@ extern "C" {
 #define SWIGRUNTIME_DEBUG
 #endif
 
+#ifndef SWIG_INIT_CLIENT_DATA_TYPE
+#define SWIG_INIT_CLIENT_DATA_TYPE void *
+#endif
 
 SWIGRUNTIME void
-SWIG_InitializeModule(void *clientdata) {
+SWIG_InitializeModule(SWIG_INIT_CLIENT_DATA_TYPE clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
   int init;
@@ -19892,9 +17961,14 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pni_connection_driver_transport", _wrap_pni_connection_driver_transport, -1);
   rb_define_module_function(mCproton, "pni_connection_driver_read_copy", _wrap_pni_connection_driver_read_copy, -1);
   rb_define_module_function(mCproton, "pni_connection_driver", _wrap_pni_connection_driver, -1);
+  
+  Pn_rbkey_class =
+  pn_class_create("Pn_rbkey", Pn_rbkey_initialize, Pn_rbkey_finalize, NULL, NULL, NULL);
+  
+  rb_define_const(mCproton, "PROTON_ANNOTATIONS_H", SWIG_From_int((int)(1)));
   rb_define_const(mCproton, "PROTON_IMPORT_EXPORT_H", SWIG_From_int((int)(1)));
   rb_define_const(mCproton, "PN_VERSION_MAJOR", SWIG_From_int((int)(0)));
-  rb_define_const(mCproton, "PN_VERSION_MINOR", SWIG_From_int((int)(37)));
+  rb_define_const(mCproton, "PN_VERSION_MINOR", SWIG_From_int((int)(40)));
   rb_define_const(mCproton, "PN_VERSION_POINT", SWIG_From_int((int)(0)));
   rb_define_const(mCproton, "PROTON_TYPES_H", SWIG_From_int((int)(1)));
   rb_define_const(mCproton, "PN_MILLIS_MAX", SWIG_From_unsigned_SS_int((unsigned int)((~0U))));
@@ -19903,95 +17977,18 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_rwbytes", _wrap_pn_rwbytes, -1);
   rb_define_singleton_method(mCproton, "pn_rwbytes_null", VALUEFUNC(_wrap_pn_rwbytes_null_get), 0);
   rb_define_const(mCproton, "PROTON_OBJECT_H", SWIG_From_int((int)(1)));
-  rb_define_singleton_method(mCproton, "PN_OBJECT", VALUEFUNC(_wrap_PN_OBJECT_get), 0);
-  rb_define_singleton_method(mCproton, "PN_VOID", VALUEFUNC(_wrap_PN_VOID_get), 0);
-  rb_define_singleton_method(mCproton, "PN_WEAKREF", VALUEFUNC(_wrap_PN_WEAKREF_get), 0);
-  rb_define_module_function(mCproton, "pn_class_id", _wrap_pn_class_id, -1);
-  rb_define_module_function(mCproton, "pn_class_name", _wrap_pn_class_name, -1);
+  rb_define_module_function(mCproton, "pn_class_create", _wrap_pn_class_create, -1);
   rb_define_module_function(mCproton, "pn_class_new", _wrap_pn_class_new, -1);
-  rb_define_module_function(mCproton, "pn_class_incref", _wrap_pn_class_incref, -1);
-  rb_define_module_function(mCproton, "pn_class_refcount", _wrap_pn_class_refcount, -1);
-  rb_define_module_function(mCproton, "pn_class_decref", _wrap_pn_class_decref, -1);
-  rb_define_module_function(mCproton, "pn_class_free", _wrap_pn_class_free, -1);
-  rb_define_module_function(mCproton, "pn_class_reify", _wrap_pn_class_reify, -1);
-  rb_define_module_function(mCproton, "pn_class_hashcode", _wrap_pn_class_hashcode, -1);
-  rb_define_module_function(mCproton, "pn_class_compare", _wrap_pn_class_compare, -1);
-  rb_define_module_function(mCproton, "pn_class_equals", _wrap_pn_class_equals, -1);
-  rb_define_module_function(mCproton, "pn_class_inspect", _wrap_pn_class_inspect, -1);
-  rb_define_module_function(mCproton, "pn_void_new", _wrap_pn_void_new, -1);
-  rb_define_module_function(mCproton, "pn_void_incref", _wrap_pn_void_incref, -1);
-  rb_define_module_function(mCproton, "pn_void_decref", _wrap_pn_void_decref, -1);
-  rb_define_module_function(mCproton, "pn_void_refcount", _wrap_pn_void_refcount, -1);
-  rb_define_module_function(mCproton, "pn_void_hashcode", _wrap_pn_void_hashcode, -1);
-  rb_define_module_function(mCproton, "pn_void_compare", _wrap_pn_void_compare, -1);
-  rb_define_module_function(mCproton, "pn_void_inspect", _wrap_pn_void_inspect, -1);
-  rb_define_module_function(mCproton, "pn_object_new", _wrap_pn_object_new, -1);
-  rb_define_module_function(mCproton, "pn_object_reify", _wrap_pn_object_reify, -1);
-  rb_define_module_function(mCproton, "pn_object_incref", _wrap_pn_object_incref, -1);
-  rb_define_module_function(mCproton, "pn_object_refcount", _wrap_pn_object_refcount, -1);
-  rb_define_module_function(mCproton, "pn_object_decref", _wrap_pn_object_decref, -1);
-  rb_define_module_function(mCproton, "pn_object_free", _wrap_pn_object_free, -1);
+  rb_define_module_function(mCproton, "pn_class_name", _wrap_pn_class_name, -1);
+  rb_define_module_function(mCproton, "pn_class_id", _wrap_pn_class_id, -1);
+  rb_define_module_function(mCproton, "pn_class", _wrap_pn_class, -1);
   rb_define_module_function(mCproton, "pn_incref", _wrap_pn_incref, -1);
   rb_define_module_function(mCproton, "pn_decref", _wrap_pn_decref, -1);
   rb_define_module_function(mCproton, "pn_refcount", _wrap_pn_refcount, -1);
   rb_define_module_function(mCproton, "pn_free", _wrap_pn_free, -1);
-  rb_define_module_function(mCproton, "pn_class", _wrap_pn_class, -1);
-  rb_define_module_function(mCproton, "pn_hashcode", _wrap_pn_hashcode, -1);
-  rb_define_module_function(mCproton, "pn_compare", _wrap_pn_compare, -1);
-  rb_define_module_function(mCproton, "pn_equals", _wrap_pn_equals, -1);
-  rb_define_module_function(mCproton, "pn_inspect", _wrap_pn_inspect, -1);
-  rb_define_const(mCproton, "PN_REFCOUNT", SWIG_From_int((int)((0x1))));
-  rb_define_module_function(mCproton, "pn_list", _wrap_pn_list, -1);
-  rb_define_module_function(mCproton, "pn_list_size", _wrap_pn_list_size, -1);
-  rb_define_module_function(mCproton, "pn_list_get", _wrap_pn_list_get, -1);
-  rb_define_module_function(mCproton, "pn_list_set", _wrap_pn_list_set, -1);
-  rb_define_module_function(mCproton, "pn_list_add", _wrap_pn_list_add, -1);
-  rb_define_module_function(mCproton, "pn_list_pop", _wrap_pn_list_pop, -1);
-  rb_define_module_function(mCproton, "pn_list_index", _wrap_pn_list_index, -1);
-  rb_define_module_function(mCproton, "pn_list_remove", _wrap_pn_list_remove, -1);
-  rb_define_module_function(mCproton, "pn_list_del", _wrap_pn_list_del, -1);
-  rb_define_module_function(mCproton, "pn_list_clear", _wrap_pn_list_clear, -1);
-  rb_define_module_function(mCproton, "pn_list_iterator", _wrap_pn_list_iterator, -1);
-  rb_define_module_function(mCproton, "pn_list_minpush", _wrap_pn_list_minpush, -1);
-  rb_define_module_function(mCproton, "pn_list_minpop", _wrap_pn_list_minpop, -1);
-  rb_define_const(mCproton, "PN_REFCOUNT_KEY", SWIG_From_int((int)((0x2))));
-  rb_define_const(mCproton, "PN_REFCOUNT_VALUE", SWIG_From_int((int)((0x4))));
-  rb_define_module_function(mCproton, "pn_map", _wrap_pn_map, -1);
-  rb_define_module_function(mCproton, "pn_map_size", _wrap_pn_map_size, -1);
-  rb_define_module_function(mCproton, "pn_map_put", _wrap_pn_map_put, -1);
-  rb_define_module_function(mCproton, "pn_map_get", _wrap_pn_map_get, -1);
-  rb_define_module_function(mCproton, "pn_map_del", _wrap_pn_map_del, -1);
-  rb_define_module_function(mCproton, "pn_map_head", _wrap_pn_map_head, -1);
-  rb_define_module_function(mCproton, "pn_map_next", _wrap_pn_map_next, -1);
-  rb_define_module_function(mCproton, "pn_map_key", _wrap_pn_map_key, -1);
-  rb_define_module_function(mCproton, "pn_map_value", _wrap_pn_map_value, -1);
-  rb_define_module_function(mCproton, "pn_hash", _wrap_pn_hash, -1);
-  rb_define_module_function(mCproton, "pn_hash_size", _wrap_pn_hash_size, -1);
-  rb_define_module_function(mCproton, "pn_hash_put", _wrap_pn_hash_put, -1);
-  rb_define_module_function(mCproton, "pn_hash_get", _wrap_pn_hash_get, -1);
-  rb_define_module_function(mCproton, "pn_hash_del", _wrap_pn_hash_del, -1);
-  rb_define_module_function(mCproton, "pn_hash_head", _wrap_pn_hash_head, -1);
-  rb_define_module_function(mCproton, "pn_hash_next", _wrap_pn_hash_next, -1);
-  rb_define_module_function(mCproton, "pn_hash_key", _wrap_pn_hash_key, -1);
-  rb_define_module_function(mCproton, "pn_hash_value", _wrap_pn_hash_value, -1);
-  rb_define_module_function(mCproton, "pn_string", _wrap_pn_string, -1);
-  rb_define_module_function(mCproton, "pn_stringn", _wrap_pn_stringn, -1);
-  rb_define_module_function(mCproton, "pn_string_get", _wrap_pn_string_get, -1);
-  rb_define_module_function(mCproton, "pn_string_size", _wrap_pn_string_size, -1);
-  rb_define_module_function(mCproton, "pn_string_set", _wrap_pn_string_set, -1);
-  rb_define_module_function(mCproton, "pn_string_setn", _wrap_pn_string_setn, -1);
-  rb_define_module_function(mCproton, "pn_string_put", _wrap_pn_string_put, -1);
-  rb_define_module_function(mCproton, "pn_string_clear", _wrap_pn_string_clear, -1);
-  rb_define_module_function(mCproton, "pn_string_format", _wrap_pn_string_format, -1);
-  rb_define_module_function(mCproton, "pn_string_addf", _wrap_pn_string_addf, -1);
-  rb_define_module_function(mCproton, "pn_string_grow", _wrap_pn_string_grow, -1);
-  rb_define_module_function(mCproton, "pn_string_buffer", _wrap_pn_string_buffer, -1);
-  rb_define_module_function(mCproton, "pn_string_capacity", _wrap_pn_string_capacity, -1);
-  rb_define_module_function(mCproton, "pn_string_resize", _wrap_pn_string_resize, -1);
-  rb_define_module_function(mCproton, "pn_string_copy", _wrap_pn_string_copy, -1);
-  rb_define_module_function(mCproton, "pn_iterator", _wrap_pn_iterator, -1);
-  rb_define_module_function(mCproton, "pn_iterator_start", _wrap_pn_iterator_start, -1);
-  rb_define_module_function(mCproton, "pn_iterator_next", _wrap_pn_iterator_next, -1);
+  rb_define_module_function(mCproton, "pn_tostring", _wrap_pn_tostring, -1);
+  rb_define_singleton_method(mCproton, "PN_OBJECT", VALUEFUNC(_wrap_PN_OBJECT_get), 0);
+  rb_define_singleton_method(mCproton, "PN_VOID", VALUEFUNC(_wrap_PN_VOID_get), 0);
   rb_define_module_function(mCproton, "pn_record", _wrap_pn_record, -1);
   rb_define_module_function(mCproton, "pn_record_def", _wrap_pn_record_def, -1);
   rb_define_module_function(mCproton, "pn_record_has", _wrap_pn_record_has, -1);
@@ -20090,6 +18087,10 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_session_close", _wrap_pn_session_close, -1);
   rb_define_module_function(mCproton, "pn_session_get_incoming_capacity", _wrap_pn_session_get_incoming_capacity, -1);
   rb_define_module_function(mCproton, "pn_session_set_incoming_capacity", _wrap_pn_session_set_incoming_capacity, -1);
+  rb_define_module_function(mCproton, "pn_session_incoming_window", _wrap_pn_session_incoming_window, -1);
+  rb_define_module_function(mCproton, "pn_session_incoming_window_lwm", _wrap_pn_session_incoming_window_lwm, -1);
+  rb_define_module_function(mCproton, "pn_session_set_incoming_window_and_lwm", _wrap_pn_session_set_incoming_window_and_lwm, -1);
+  rb_define_module_function(mCproton, "pn_session_remote_incoming_window", _wrap_pn_session_remote_incoming_window, -1);
   rb_define_module_function(mCproton, "pn_session_get_outgoing_window", _wrap_pn_session_get_outgoing_window, -1);
   rb_define_module_function(mCproton, "pn_session_set_outgoing_window", _wrap_pn_session_set_outgoing_window, -1);
   rb_define_module_function(mCproton, "pn_session_outgoing_bytes", _wrap_pn_session_outgoing_bytes, -1);
@@ -20351,6 +18352,7 @@ SWIGEXPORT void Init_cproton(void) {
   rb_define_module_function(mCproton, "pn_collector_release", _wrap_pn_collector_release, -1);
   rb_define_module_function(mCproton, "pn_collector_drain", _wrap_pn_collector_drain, -1);
   rb_define_module_function(mCproton, "pn_collector_put", _wrap_pn_collector_put, -1);
+  rb_define_module_function(mCproton, "pn_collector_put_object", _wrap_pn_collector_put_object, -1);
   rb_define_module_function(mCproton, "pn_collector_peek", _wrap_pn_collector_peek, -1);
   rb_define_module_function(mCproton, "pn_collector_pop", _wrap_pn_collector_pop, -1);
   rb_define_module_function(mCproton, "pn_collector_next", _wrap_pn_collector_next, -1);