Type cleanup.

src/com/frostwire/jlibtorrent/swig/libtorrent.java

@@ -85,22 +85,6 @@ public static long_long_long_2_pair_vector get_filesizes(file_storage t, String
     return new long_long_long_2_pair_vector(libtorrent_jni.get_filesizes(file_storage.getCPtr(t), t, p), true);
   }
 
-  public static int bufs_size(SWIGTYPE_p_file__iovec_t bufs, int num_bufs) {
-    return libtorrent_jni.bufs_size(SWIGTYPE_p_file__iovec_t.getCPtr(bufs), num_bufs);
-  }
-
-  public static int copy_bufs(SWIGTYPE_p_file__iovec_t bufs, int bytes, SWIGTYPE_p_file__iovec_t target) {
-    return libtorrent_jni.copy_bufs(SWIGTYPE_p_file__iovec_t.getCPtr(bufs), bytes, SWIGTYPE_p_file__iovec_t.getCPtr(target));
-  }
-
-  public static void advance_bufs(SWIGTYPE_p_p_file__iovec_t bufs, int bytes) {
-    libtorrent_jni.advance_bufs(SWIGTYPE_p_p_file__iovec_t.getCPtr(bufs), bytes);
-  }
-
-  public static void clear_bufs(SWIGTYPE_p_file__iovec_t bufs, int num_bufs) {
-    libtorrent_jni.clear_bufs(SWIGTYPE_p_file__iovec_t.getCPtr(bufs), num_bufs);
-  }
-
   public static void sanitize_append_path_element(String path, String element, int element_len) {
     libtorrent_jni.sanitize_append_path_element(path, element, element_len);
   }

src/com/frostwire/jlibtorrent/swig/libtorrent_jni.java

@@ -807,10 +807,6 @@ public class libtorrent_jni {
   public final static native long storage_params_info_get(long jarg1, storage_params jarg1_);
   public final static native void delete_storage_params(long jarg1);
   public final static native long get_filesizes(long jarg1, file_storage jarg1_, String jarg2);
-  public final static native int bufs_size(long jarg1, int jarg2);
-  public final static native int copy_bufs(long jarg1, int jarg2, long jarg3);
-  public final static native void advance_bufs(long jarg1, int jarg2);
-  public final static native void clear_bufs(long jarg1, int jarg2);
   public final static native void zero_storage_initialize(long jarg1, zero_storage jarg1_, long jarg2, storage_error jarg2_);
   public final static native boolean zero_storage_has_any_file(long jarg1, zero_storage jarg1_, long jarg2, storage_error jarg2_);
   public final static native void zero_storage_set_file_priority(long jarg1, zero_storage jarg1_, long jarg2, unsigned_char_vector jarg2_, long jarg3, storage_error jarg3_);
@@ -826,7 +822,6 @@ public class libtorrent_jni {
   public final static native void storage_piece_set_remove_piece(long jarg1, storage_piece_set jarg1_, long jarg2);
   public final static native boolean storage_piece_set_has_piece(long jarg1, storage_piece_set jarg1_, long jarg2);
   public final static native int storage_piece_set_num_pieces(long jarg1, storage_piece_set jarg1_);
-  public final static native long storage_piece_set_cached_pieces(long jarg1, storage_piece_set jarg1_);
   public final static native long new_storage_piece_set();
   public final static native void delete_storage_piece_set(long jarg1);
   public final static native void file_slice_file_index_set(long jarg1, file_slice jarg1_, int jarg2);
@@ -2749,8 +2744,6 @@ public class libtorrent_jni {
   public final static native long peer_connection_args_sett_get(long jarg1, peer_connection_args jarg1_);
   public final static native void peer_connection_args_stats_counters_set(long jarg1, peer_connection_args jarg1_, long jarg2);
   public final static native long peer_connection_args_stats_counters_get(long jarg1, peer_connection_args jarg1_);
-  public final static native void peer_connection_args_ios_set(long jarg1, peer_connection_args jarg1_, long jarg2);
-  public final static native long peer_connection_args_ios_get(long jarg1, peer_connection_args jarg1_);
   public final static native void peer_connection_args_s_set(long jarg1, peer_connection_args jarg1_, long jarg2);
   public final static native long peer_connection_args_s_get(long jarg1, peer_connection_args jarg1_);
   public final static native void peer_connection_args_endp_set(long jarg1, peer_connection_args jarg1_, long jarg2, tcp_endpoint jarg2_);

src/com/frostwire/jlibtorrent/swig/peer_connection_args.java

@@ -62,15 +62,6 @@ public SWIGTYPE_p_libtorrent__counters getStats_counters() {
     return (cPtr == 0) ? null : new SWIGTYPE_p_libtorrent__counters(cPtr, false);
   }
 
-  public void setIos(SWIGTYPE_p_io_service value) {
-    libtorrent_jni.peer_connection_args_ios_set(swigCPtr, this, SWIGTYPE_p_io_service.getCPtr(value));
-  }
-
-  public SWIGTYPE_p_io_service getIos() {
-    long cPtr = libtorrent_jni.peer_connection_args_ios_get(swigCPtr, this);
-    return (cPtr == 0) ? null : new SWIGTYPE_p_io_service(cPtr, false);
-  }
-
   public void setS(SWIGTYPE_p_boost__shared_ptrT_socket_type_t value) {
     libtorrent_jni.peer_connection_args_s_set(swigCPtr, this, SWIGTYPE_p_boost__shared_ptrT_socket_type_t.getCPtr(value));
   }

src/com/frostwire/jlibtorrent/swig/storage_piece_set.java

@@ -51,10 +51,6 @@ public int num_pieces() {
     return libtorrent_jni.storage_piece_set_num_pieces(swigCPtr, this);
   }
 
-  public SWIGTYPE_p_boost__unordered_setT_libtorrent__cached_piece_entry_p_t cached_pieces() {
-    return new SWIGTYPE_p_boost__unordered_setT_libtorrent__cached_piece_entry_p_t(libtorrent_jni.storage_piece_set_cached_pieces(swigCPtr, this), false);
-  }
-
   public storage_piece_set() {
     this(libtorrent_jni.new_storage_piece_set(), true);
   }

swig/libtorrent.i

@@ -485,6 +485,7 @@ namespace std {
 %ignore libtorrent::peer_connection_args::allocator;
 %ignore libtorrent::peer_connection_args::tor;
 %ignore libtorrent::peer_connection_args::disk_thread;
+%ignore libtorrent::peer_connection_args::ios;
 %ignore libtorrent::disk_io_job::callback;
 %ignore libtorrent::disk_io_job::storage;
 %ignore libtorrent::disk_buffer_holder::disk_buffer_holder;
@@ -570,11 +571,16 @@ namespace std {
 %ignore libtorrent::has_bits;
 %ignore libtorrent::count_zero_bits;
 %ignore libtorrent::zero_storage_constructor;
+%ignore libtorrent::advance_bufs;
+%ignore libtorrent::bufs_size;
+%ignore libtorrent::clear_bufs;
+%ignore libtorrent::copy_bufs;
 
 %ignore libtorrent::detail::nop;
 %ignore libtorrent::session::m_impl;
 %ignore libtorrent::storage_params::pool;
 %ignore libtorrent::cached_piece_info::storage;
+%ignore libtorrent::storage_piece_set::cached_pieces;
 
 %ignore boost::throws;
 %ignore boost::detail::throws;

swig/libtorrent_jni.cpp

@@ -18664,96 +18664,6 @@ SWIGEXPORT jlong JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_get
 }
 
 
-SWIGEXPORT jint JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_bufs_1size(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  jint jresult = 0 ;
-  file::iovec_t *arg1 = (file::iovec_t *) 0 ;
-  int arg2 ;
-  int result;
-
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(file::iovec_t **)&jarg1; 
-  arg2 = (int)jarg2; 
-  {
-    try {
-      result = (int)libtorrent::bufs_size((file::iovec_t const *)arg1,arg2);
-    } catch (...) {
-      translate_cpp_exception(jenv);
-      return 0;
-    }
-  }
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT jint JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_copy_1bufs(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2, jlong jarg3) {
-  jint jresult = 0 ;
-  file::iovec_t *arg1 = (file::iovec_t *) 0 ;
-  int arg2 ;
-  file::iovec_t *arg3 = (file::iovec_t *) 0 ;
-  int result;
-
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(file::iovec_t **)&jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = *(file::iovec_t **)&jarg3; 
-  {
-    try {
-      result = (int)libtorrent::copy_bufs((file::iovec_t const *)arg1,arg2,arg3);
-    } catch (...) {
-      translate_cpp_exception(jenv);
-      return 0;
-    }
-  }
-  jresult = (jint)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_advance_1bufs(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  file::iovec_t **arg1 = 0 ;
-  int arg2 ;
-
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(file::iovec_t ***)&jarg1;
-  if (!arg1) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "file::iovec_t *& reference is null");
-    return ;
-  } 
-  arg2 = (int)jarg2; 
-  {
-    try {
-      libtorrent::advance_bufs(*arg1,arg2);
-    } catch (...) {
-      translate_cpp_exception(jenv);
-      return ;
-    }
-  }
-}
-
-
-SWIGEXPORT void JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_clear_1bufs(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {
-  file::iovec_t *arg1 = (file::iovec_t *) 0 ;
-  int arg2 ;
-
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(file::iovec_t **)&jarg1; 
-  arg2 = (int)jarg2; 
-  {
-    try {
-      libtorrent::clear_bufs((file::iovec_t const *)arg1,arg2);
-    } catch (...) {
-      translate_cpp_exception(jenv);
-      return ;
-    }
-  }
-}
-
-
 SWIGEXPORT void JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_zero_1storage_1initialize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
   libtorrent::zero_storage *arg1 = (libtorrent::zero_storage *) 0 ;
   libtorrent::storage_error *arg2 = 0 ;
@@ -19159,28 +19069,6 @@ SWIGEXPORT jint JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_stor
 }
 
 
-SWIGEXPORT jlong JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_storage_1piece_1set_1cached_1pieces(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  libtorrent::storage_piece_set *arg1 = (libtorrent::storage_piece_set *) 0 ;
-  boost::unordered_set< libtorrent::cached_piece_entry * > *result = 0 ;
-
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(libtorrent::storage_piece_set **)&jarg1; 
-  {
-    try {
-      result = (boost::unordered_set< libtorrent::cached_piece_entry * > *) &((libtorrent::storage_piece_set const *)arg1)->cached_pieces();
-    } catch (...) {
-      translate_cpp_exception(jenv);
-      return 0;
-    }
-  }
-  *(boost::unordered_set< libtorrent::cached_piece_entry * > **)&jresult = result; 
-  return jresult;
-}
-
-
 SWIGEXPORT jlong JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_new_1storage_1piece_1set(JNIEnv *jenv, jclass jcls) {
   jlong jresult = 0 ;
   libtorrent::storage_piece_set *result = 0 ;
@@ -54927,34 +54815,6 @@ SWIGEXPORT jlong JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_pee
 }
 
 
-SWIGEXPORT void JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_peer_1connection_1args_1ios_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  libtorrent::peer_connection_args *arg1 = (libtorrent::peer_connection_args *) 0 ;
-  io_service *arg2 = (io_service *) 0 ;
-
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(libtorrent::peer_connection_args **)&jarg1; 
-  arg2 = *(io_service **)&jarg2; 
-  if (arg1) (arg1)->ios = arg2;
-}
-
-
-SWIGEXPORT jlong JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_peer_1connection_1args_1ios_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jlong jresult = 0 ;
-  libtorrent::peer_connection_args *arg1 = (libtorrent::peer_connection_args *) 0 ;
-  io_service *result = 0 ;
-
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(libtorrent::peer_connection_args **)&jarg1; 
-  result = (io_service *) ((arg1)->ios);
-  *(io_service **)&jresult = result; 
-  return jresult;
-}
-
-
 SWIGEXPORT void JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_peer_1connection_1args_1s_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
   libtorrent::peer_connection_args *arg1 = (libtorrent::peer_connection_args *) 0 ;
   boost::shared_ptr< socket_type > *arg2 = (boost::shared_ptr< socket_type > *) 0 ;