cproton.c in qpid_proton-0.36.0

- old
+ new

@@ -13643,11 +13643,11 @@
 SWIGINTERN VALUE
 _wrap_pn_message_get_id(int argc, VALUE *argv, VALUE self) {
   pn_message_t *arg1 = (pn_message_t *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  pn_atom_t result;
+  pn_msgid_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
@@ -13725,11 +13725,11 @@
 
 
 SWIGINTERN VALUE
 _wrap_pn_message_set_id(int argc, VALUE *argv, VALUE self) {
   pn_message_t *arg1 = (pn_message_t *) 0 ;
-  pn_atom_t arg2 ;
+  pn_msgid_t arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int result;
   VALUE vresult = Qnil;
   
@@ -13789,12 +13789,10 @@
         break;
         
       }
     }
   }
-  SWIG_contract_assert((arg1!=NULL), "Contract violation: require: (arg1!=NULL)");
-  
   result = (int)pn_message_set_id(arg1,arg2);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
   return Qnil;
@@ -14084,11 +14082,11 @@
 SWIGINTERN VALUE
 _wrap_pn_message_get_correlation_id(int argc, VALUE *argv, VALUE self) {
   pn_message_t *arg1 = (pn_message_t *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  pn_atom_t result;
+  pn_msgid_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
@@ -14166,11 +14164,11 @@
 
 
 SWIGINTERN VALUE
 _wrap_pn_message_set_correlation_id(int argc, VALUE *argv, VALUE self) {
   pn_message_t *arg1 = (pn_message_t *) 0 ;
-  pn_atom_t arg2 ;
+  pn_msgid_t arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int result;
   VALUE vresult = Qnil;
   
@@ -14230,12 +14228,10 @@
         break;
         
       }
     }
   }
-  SWIG_contract_assert((arg1!=NULL), "Contract violation: require: (arg1!=NULL)");
-  
   result = (int)pn_message_set_correlation_id(arg1,arg2);
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
   return Qnil;
@@ -19157,11 +19153,11 @@
 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_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 *", 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};
@@ -19742,10 +19738,10 @@
   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);
   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)(35)));
+  rb_define_const(mCproton, "PN_VERSION_MINOR", SWIG_From_int((int)(36)));
   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))));
   rb_define_module_function(mCproton, "pn_bytes", _wrap_pn_bytes, -1);
   rb_define_singleton_method(mCproton, "pn_bytes_null", _wrap_pn_bytes_null_get, 0);