evecache 0.42.1 → 0.42.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00f47532df858c60af50ca24e1e98c87e62aa1ed
-  data.tar.gz: 1e1fb9e16acc2498eb759570c3afc2fe45256481
+  metadata.gz: cccad7dba4a6d2f0bc9d30af30af2a334f19e2ed
+  data.tar.gz: 43a44bc51357cd2cb824bdbb76391f431b5f8e7a
 SHA512:
-  metadata.gz: c30598df4498680602d7b8dde9331d03005d6de407570301c172eaeaadb93f85864c7bca3e21548df3d6737c32bf090ade1c43c04431567383761fc780fca75a
-  data.tar.gz: 224dbd954c4d961cc5626458db6c4494cb713bde30c11eece7326a1856625a4292b6045a69be8dbdfa13287f3aba98dd48ac0335597d6b0074cfc5d6c2e9a340
+  metadata.gz: fd30c5416de76994c4f2f650b0fe2e449219c771ba480d34685feb312e5fbc1341fb2661244c143a4f7b1dfaf662ec1d099e3f79ca4b9184f58089ed1c5cf97f
+  data.tar.gz: e13e625666c68f2b4a08aaef559dac0c5376e0f8b55c8018ba09d5473578079a1874adcc21c418b9c126b6028e0dd2a381f261703b764ab53c7d6e690df901d4

data/evecache.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "evecache"
-  s.version     = "0.42.1"
+  s.version     = "0.42.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Marvin Frick"]
   s.email       = ["marv@hostin.is"]

data/ext/evecache/evecache.cxx

@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.6
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 3.0.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. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -65,28 +65,28 @@ template <typename T> T SwigValueInit() {
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -129,7 +129,7 @@ template <typename T> T SwigValueInit() {
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -174,28 +174,28 @@ template <typename T> T SwigValueInit() {
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -238,7 +238,7 @@ template <typename T> T SwigValueInit() {
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -276,7 +276,7 @@ template <typename T> T SwigValueInit() {
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -302,16 +302,16 @@ template <typename T> T SwigValueInit() {
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -344,23 +344,23 @@ template <typename T> T SwigValueInit() {
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -374,17 +374,17 @@ template <typename T> T SwigValueInit() {
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -415,14 +415,14 @@ template <typename T> T SwigValueInit() {
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -466,7 +466,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -486,18 +486,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -505,24 +505,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -550,7 +539,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -585,7 +574,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -629,7 +618,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -637,14 +626,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -653,31 +642,31 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
     if (iter->size) {
-      register size_t l = 0;
-      register size_t r = iter->size - 1;
+      size_t l = 0;
+      size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
-	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  int compare = strcmp(name, iname);
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -702,14 +691,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -720,7 +709,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
        of the str field (the human readable name) */
     swig_module_info *iter = start;
     do {
-      register size_t i = 0;
+      size_t i = 0;
       for (; i < iter->size; ++i) {
 	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
 	  return iter->types[i];
@@ -728,56 +717,56 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
 SWIG_PackData(char *c, void *ptr, size_t sz) {
   static const char hex[17] = "0123456789abcdef";
-  register const unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu =  u + sz;
+  const unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu =  u + sz;
   for (; u != eu; ++u) {
-    register unsigned char uu = *u;
+    unsigned char uu = *u;
     *(c++) = hex[(uu & 0xf0) >> 4];
     *(c++) = hex[uu & 0xf];
   }
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
 SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  register unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu = u + sz;
+  unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu = u + sz;
   for (; u != eu; ++u) {
-    register char d = *(c++);
-    register unsigned char uu;
+    char d = *(c++);
+    unsigned char uu;
     if ((d >= '0') && (d <= '9'))
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -837,18 +826,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1398,7 +1387,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()	
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
 
 
@@ -1514,14 +1503,13 @@ SWIG_Ruby_InitRuntime(void)
 SWIGRUNTIME void
 SWIG_Ruby_define_class(swig_type_info *type)
 {
-  VALUE klass;
   char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
   sprintf(klass_name, "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");
   }
-  klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
+  rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
   free((void *) klass_name);
 }
 
@@ -1734,7 +1722,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void)
+SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
   VALUE pointer;
   swig_module_info *ret = 0;
@@ -1774,7 +1762,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1787,7 +1775,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1871,7 +1859,7 @@ static VALUE mEvecache;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020006 
+#define SWIGVERSION 0x030000 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1900,11 +1888,64 @@ static VALUE mEvecache;
 
 
 namespace swig {
-  class GC_VALUE {
-  protected:
+  class SwigGCReferences {
     // Hash of all GC_VALUE's currently in use
-    static VALUE _hash;
+    static SwigGCReferences s_references;
+
+    VALUE _hash;
 
+    SwigGCReferences() : _hash(Qnil) {
+    }
+    ~SwigGCReferences() {
+      if (_hash != Qnil)
+        rb_gc_unregister_address(&_hash);
+    }
+    static void EndProcHandler(VALUE) {
+      // Ruby interpreter ending - _hash can no longer be accessed.
+      s_references._hash = Qnil;
+    }
+  public:
+    static SwigGCReferences& instance() {
+      return s_references;
+    }
+    static void initialize() {
+      if (s_references._hash == Qnil) {
+        rb_set_end_proc(&EndProcHandler, Qnil);
+        s_references._hash = rb_hash_new();
+        rb_gc_register_address(&s_references._hash);
+      }
+    }
+    void GC_register(VALUE& obj) {
+      if (FIXNUM_P(obj) || SPECIAL_CONST_P(obj) || SYMBOL_P(obj))
+        return;
+      if (_hash != Qnil) {
+        VALUE val = rb_hash_aref(_hash, obj);
+        unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 0;
+        ++n;
+        rb_hash_aset(_hash, obj, INT2NUM(n));
+      }
+    }
+    void GC_unregister(const VALUE& obj) {
+      if (FIXNUM_P(obj) || SPECIAL_CONST_P(obj) || SYMBOL_P(obj))
+        return;
+      // this test should not be needed but I've noticed some very erratic
+      // behavior of none being unregistered in some very rare situations.
+      if (BUILTIN_TYPE(obj) == T_NONE)
+        return;
+      if (_hash != Qnil) {
+        VALUE val = rb_hash_aref(s_references._hash, obj);
+        unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 1;
+        --n;
+        if (n)
+          rb_hash_aset(s_references._hash, obj, INT2NUM(n));
+        else
+          rb_hash_delete(s_references._hash, obj);
+      }
+    }
+  };
+
+  class GC_VALUE {
+  protected:
     VALUE  _obj;
 
     static ID hash_id;
@@ -1941,75 +1982,33 @@ namespace swig {
 
 
   public:
-    static void initialize()
-    {
-      if ( _hash == Qnil ) 
-	{ 
-	  _hash = rb_hash_new();
-	  rb_gc_register_address( &_hash );
-	}
-    }
-
-    // this function is never called.  Provided for symmetry only.
-    static void cleanup()
-    {
-      rb_gc_unregister_address( &_hash );
-    }
-
-    GC_VALUE() : _obj( Qnil )
+    GC_VALUE() : _obj(Qnil)
     {
     }
 
     GC_VALUE(const GC_VALUE& item) : _obj(item._obj)
     {
-      GC_register();
+      SwigGCReferences::instance().GC_register(_obj);
     }
     
     GC_VALUE(VALUE obj) :_obj(obj)
     {
-      GC_register();
+      SwigGCReferences::instance().GC_register(_obj);
     }
     
     ~GC_VALUE() 
     {
-      GC_unregister();
+      SwigGCReferences::instance().GC_unregister(_obj);
     }
     
     GC_VALUE & operator=(const GC_VALUE& item) 
     {
-      GC_unregister();
+      SwigGCReferences::instance().GC_unregister(_obj);
       _obj = item._obj;
-      GC_register();
+      SwigGCReferences::instance().GC_register(_obj);
       return *this;
     }
 
-    void GC_register()
-    {
-      if ( FIXNUM_P(_obj) || SPECIAL_CONST_P(_obj) || SYMBOL_P(_obj) ) 
-	return;
-      VALUE val = rb_hash_aref( _hash, _obj );
-      unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 0;
-      ++n;
-      rb_hash_aset( _hash, _obj, INT2NUM(n) );
-    }
-
-    void GC_unregister()
-    {
-      if ( FIXNUM_P(_obj) || SPECIAL_CONST_P(_obj) || SYMBOL_P(_obj) ) 
-	return;
-      // this test should not be needed but I've noticed some very erratic
-      // behavior of none being unregistered in some very rare situations.
-      if ( BUILTIN_TYPE(_obj) == T_NONE ) return;
-
-      VALUE val = rb_hash_aref( _hash, _obj );
-      unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 1;
-      --n;
-      if ( n )
-	rb_hash_aset( _hash, _obj, INT2NUM(n) );
-      else
-	rb_hash_delete( _hash, _obj );
-    }
-    
     operator VALUE() const
     {
       return _obj;
@@ -2025,113 +2024,110 @@ namespace swig {
       return rb_inspect(_obj);
     }
 
-    static VALUE swig_protect_funcall( VALUE p )
+    static VALUE swig_rescue_swallow(VALUE)
+    {
+      /*
+      VALUE errstr = rb_obj_as_string(rb_errinfo());
+      printf("Swallowing error: '%s'\n", RSTRING_PTR(StringValue(errstr)));
+      */
+      return Qnil; /* Swallow Ruby exception */
+    }
+
+    static VALUE swig_rescue_funcall(VALUE p)
     {
       OpArgs* args = (OpArgs*) p;
-      return rb_funcall( args->src, args->id, args->nargs, args->target );
-    }
-
-
-#define GC_VALUE_CMP( op_id, op, cmp, cmpval ) \
-    bool op( const GC_VALUE& other ) const \
-    { \
-      if ( FIXNUM_P(_obj) && FIXNUM_P(other._obj) ) \
-      { \
-	return _obj cmp other._obj; \
-      } \
-      bool  res = false; \
-      VALUE ret = Qnil; \
-      SWIG_RUBY_THREAD_BEGIN_BLOCK; \
-      if ( rb_respond_to( _obj, op_id ) == Qtrue ) \
-	{ \
-	  int status; \
-	  OpArgs  args; \
-          args.src    = _obj; \
-	  args.id     = op_id; \
-	  args.nargs  = 1; \
-	  args.target = VALUE(other); \
-	  ret = rb_protect( PROTECTFUNC(swig_protect_funcall), \
-                            VALUE(&args), &status ); \
-	} \
-      if ( ret == Qnil ) { \
-	VALUE a = rb_funcall(         _obj, hash_id, 0 ); \
-	VALUE b = rb_funcall( VALUE(other), hash_id, 0 ); \
-	res = a cmp b; \
-      } \
-      else \
-	{ \
-	  res = RTEST( ret ); \
-	} \
-      SWIG_RUBY_THREAD_END_BLOCK; \
-      return res; \
-    }
-
-
-    GC_VALUE_CMP( eq_id, operator==, ==, == 0 )
-    GC_VALUE_CMP( lt_id, operator<,  < , <  0 )
-    GC_VALUE_CMP( le_id, operator<=, <=, <= 0 )
-    GC_VALUE_CMP( gt_id, operator>,  > , >  0 )
-    GC_VALUE_CMP( ge_id, operator>=, >=, >= 0 )
-#undef GC_VALUE_CMP
-
-    bool operator!=( const GC_VALUE& other )
+      return rb_funcall(args->src, args->id, args->nargs, args->target);
+    }
+
+    bool relational_equal_op(const GC_VALUE& other, const ID& op_id, bool (*op_func)(const VALUE& a, const VALUE& b)) const
     {
-      return !(this->operator==(other));
+      if (FIXNUM_P(_obj) && FIXNUM_P(other._obj)) {
+        return op_func(_obj, other._obj);
+      }
+      bool res = false;
+      VALUE ret = Qnil;
+      SWIG_RUBY_THREAD_BEGIN_BLOCK;
+      if (rb_respond_to(_obj, op_id)) {
+        OpArgs  args;
+        args.src    = _obj;
+        args.id     = op_id;
+        args.nargs  = 1;
+        args.target = VALUE(other);
+        ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args),
+                       (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil);
+      }
+      if (ret == Qnil) {
+        VALUE a = rb_funcall(         _obj, hash_id, 0 );
+        VALUE b = rb_funcall( VALUE(other), hash_id, 0 );
+        res = op_func(a, b);
+      } else {
+        res = RTEST(ret);
+      }
+      SWIG_RUBY_THREAD_END_BLOCK;
+      return res;
     }
 
-#define GC_VALUE_UNARY( proc_id, op ) \
-    GC_VALUE op() const \
-    { \
-      VALUE ret = Qnil; \
-      SWIG_RUBY_THREAD_BEGIN_BLOCK; \
-      int status; \
-      OpArgs  args; \
-      args.src    = _obj; \
-      args.id     = proc_id; \
-      args.nargs  = 0; \
-      args.target = Qnil; \
-      ret = rb_protect( PROTECTFUNC(swig_protect_funcall), VALUE(&args), \
-			&status ); \
-      SWIG_RUBY_THREAD_END_BLOCK; \
-      return ret; \
-    }
-
-    GC_VALUE_UNARY( pos_id, operator+ )
-    GC_VALUE_UNARY( neg_id, operator- )
-    GC_VALUE_UNARY( inv_id, operator~ )
-#undef GC_VALUE_BINARY
-
-#define GC_VALUE_BINARY( proc_id, op ) \
-    GC_VALUE op( const GC_VALUE& other ) const \
-    { \
-      VALUE ret = Qnil; \
-      SWIG_RUBY_THREAD_BEGIN_BLOCK; \
-      int status; \
-      OpArgs  args; \
-      args.src    = _obj; \
-      args.id     = proc_id; \
-      args.nargs  = 1; \
-      args.target = VALUE(other); \
-      ret = rb_protect( PROTECTFUNC(swig_protect_funcall), VALUE(&args), \
-			&status ); \
-      SWIG_RUBY_THREAD_END_BLOCK; \
-      return GC_VALUE(ret); \
-    }
-
-    GC_VALUE_BINARY( add_id, operator+ );
-    GC_VALUE_BINARY( sub_id, operator- );
-    GC_VALUE_BINARY( mul_id, operator* );
-    GC_VALUE_BINARY( div_id, operator/ );
-    GC_VALUE_BINARY( mod_id, operator% );
-    
-    GC_VALUE_BINARY( and_id, operator& );
-    GC_VALUE_BINARY( xor_id, operator^ );
-    GC_VALUE_BINARY(  or_id, operator| );
+    static bool operator_eq(const VALUE& a, const VALUE& b) { return a == b; }
+    static bool operator_lt(const VALUE& a, const VALUE& b) { return a < b; }
+    static bool operator_le(const VALUE& a, const VALUE& b) { return a <= b; }
+    static bool operator_gt(const VALUE& a, const VALUE& b) { return a > b; }
+    static bool operator_ge(const VALUE& a, const VALUE& b) { return a >= b; }
 
-    GC_VALUE_BINARY( lshift_id, operator<< );
-    GC_VALUE_BINARY( rshift_id, operator>> );
-#undef GC_VALUE_BINARY
+    bool operator==(const GC_VALUE& other) const { return relational_equal_op(other, eq_id, operator_eq); }
+    bool operator<(const GC_VALUE& other) const { return relational_equal_op(other, lt_id, operator_lt); }
+    bool operator<=(const GC_VALUE& other) const { return relational_equal_op(other, le_id, operator_le); }
+    bool operator>(const GC_VALUE& other) const { return relational_equal_op(other, gt_id, operator_gt); }
+    bool operator>=(const GC_VALUE& other) const { return relational_equal_op(other, ge_id, operator_ge); }
 
+    bool operator!=(const GC_VALUE& other) const
+    {
+      return !(this->operator==(other));
+    }
+
+    GC_VALUE unary_op(const ID& op_id) const
+    {
+      VALUE ret = Qnil;
+      SWIG_RUBY_THREAD_BEGIN_BLOCK;
+      OpArgs  args;
+      args.src    = _obj;
+      args.id     = op_id;
+      args.nargs  = 0;
+      args.target = Qnil;
+      ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args),
+                     (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil);
+      SWIG_RUBY_THREAD_END_BLOCK;
+      return ret;
+    }
+
+    GC_VALUE operator+() const { return unary_op(pos_id); }
+    GC_VALUE operator-() const { return unary_op(neg_id); }
+    GC_VALUE operator~() const { return unary_op(inv_id); }
+
+    GC_VALUE binary_op(const GC_VALUE& other, const ID& op_id) const
+    {
+      VALUE ret = Qnil;
+      SWIG_RUBY_THREAD_BEGIN_BLOCK;
+      OpArgs  args;
+      args.src    = _obj;
+      args.id     = op_id;
+      args.nargs  = 1;
+      args.target = VALUE(other);
+      ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args),
+                     (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil);
+      SWIG_RUBY_THREAD_END_BLOCK;
+      return GC_VALUE(ret);
+    }
+
+    GC_VALUE operator+(const GC_VALUE& other) const { return binary_op(other, add_id); }
+    GC_VALUE operator-(const GC_VALUE& other) const { return binary_op(other, sub_id); }
+    GC_VALUE operator*(const GC_VALUE& other) const { return binary_op(other, mul_id); }
+    GC_VALUE operator/(const GC_VALUE& other) const { return binary_op(other, div_id); }
+    GC_VALUE operator%(const GC_VALUE& other) const { return binary_op(other, mod_id); }
+    GC_VALUE operator&(const GC_VALUE& other) const { return binary_op(other, and_id); }
+    GC_VALUE operator^(const GC_VALUE& other) const { return binary_op(other, xor_id); }
+    GC_VALUE operator|(const GC_VALUE& other) const { return binary_op(other, or_id); }
+    GC_VALUE operator<<(const GC_VALUE& other) const { return binary_op(other, lshift_id); }
+    GC_VALUE operator>>(const GC_VALUE& other) const { return binary_op(other, rshift_id); }
   };
 
   ID  GC_VALUE::hash_id = rb_intern("hash");
@@ -2158,7 +2154,7 @@ namespace swig {
   ID  GC_VALUE::lshift_id = rb_intern("<<");
   ID  GC_VALUE::rshift_id = rb_intern(">>");
 
-  VALUE GC_VALUE::_hash = Qnil;
+  SwigGCReferences SwigGCReferences::s_references;
 
   typedef GC_VALUE LANGUAGE_OBJ;
 
@@ -2173,14 +2169,9 @@ namespace swig {
 #endif
 
 
-#include <string>
-#include <stdexcept>
 #include <stddef.h>
 
 
-  #include <stddef.h>
-
-
 namespace swig {
   struct stop_iteration {
   };
@@ -2444,7 +2435,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.6/share/swig/2.0.6/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.0/share/swig/3.0.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2490,7 +2481,7 @@ SWIG_From_bool  (bool value)
 }
 
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.6/share/swig/2.0.6/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.0/share/swig/3.0.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2549,9 +2540,6 @@ SWIG_From_ptrdiff_t  (ptrdiff_t value)
 }
 
 
-#include <stdexcept>
-
-
 #include <algorithm>
 
 
@@ -2652,11 +2640,7 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
-    #if defined(StringValuePtr)
     char *cstr = StringValuePtr(obj); 
-    #else
-    char *cstr = STR2CSTR(obj);
-    #endif
     size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {
@@ -2740,13 +2724,13 @@ SWIG_From_unsigned_SS_char  (unsigned char value)
 }
 
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.6/share/swig/2.0.6/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.0/share/swig/3.0.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
   VALUE type = TYPE(obj);
   double *res = (double *)(args[1]);
-  *res = NUM2DBL(obj);
+  *res = NUM2DBL(obj); (void)type;
   return obj;
 }
 /*@SWIG@*/
@@ -2772,7 +2756,7 @@ SWIG_AsVal_double (VALUE obj, double *val)
   #define SWIG_From_double   rb_float_new 
 
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.6/share/swig/2.0.6/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.0/share/swig/3.0.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2828,7 +2812,7 @@ SWIG_AsVal_bool (VALUE obj, bool *val)
 }
 
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.6/share/swig/2.0.6/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.0/share/swig/3.0.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -4375,25 +4359,6 @@ SWIGINTERN std::vector< EveCache::MarketOrder,std::allocator< EveCache::MarketOr
 	
       return r;
     }
-SWIGINTERN std::vector< EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > > *std_vector_Sl_EveCache_MarketOrder_Sg__reject_bang(std::vector< EveCache::MarketOrder > *self){
-      if ( !rb_block_given_p() )
-	rb_raise( rb_eArgError, "no block given" );
-
-      std::vector<EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > >::iterator i = self->begin();
-      std::vector<EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > >::iterator e = self->end();
-      for ( ; i != e; )
-	{
-	  VALUE r = swig::from< std::vector<EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > >::value_type >(*i);
-	  if ( RTEST( rb_yield(r) ) ) {
-	    self->erase(i++);
-            e = self->end();
-	  } else {
-	    ++i;
-          }
-	}
-	
-      return self;
-    }
 SWIGINTERN VALUE std_vector_Sl_EveCache_MarketOrder_Sg__delete_at(std::vector< EveCache::MarketOrder > *self,std::vector< EveCache::MarketOrder >::difference_type i){
       VALUE r = Qnil;
       try {
@@ -4410,6 +4375,14 @@ SWIGINTERN VALUE std_vector_Sl_EveCache_MarketOrder_Sg____delete2__(std::vector<
       VALUE r = Qnil;
       return r;
     }
+SWIGINTERN std::vector< EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > > *std_vector_Sl_EveCache_MarketOrder_Sg__reject_bang(std::vector< EveCache::MarketOrder > *self){
+      if ( !rb_block_given_p() )
+	rb_raise( rb_eArgError, "no block given" );
+
+      self->erase( std::remove_if( self->begin(), self->end(),
+            swig::yield< std::vector<EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > >::value_type >() ), self->end() );
+      return self;
+    }
 SWIGINTERN VALUE std_vector_Sl_EveCache_MarketOrder_Sg__pop(std::vector< EveCache::MarketOrder > *self){
       if (self->empty()) return Qnil;
       std::vector<EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > >::value_type x = self->back();
@@ -4471,7 +4444,6 @@ SWIGINTERN VALUE std_vector_Sl_EveCache_MarketOrder_Sg____getitem____SWIG_2(std:
 	  rb_raise( rb_eTypeError, "not a valid index or range" );
 	}
 
-      VALUE r = Qnil;
       static ID id_end   = rb_intern("end");
       static ID id_start = rb_intern("begin");
       static ID id_noend = rb_intern("exclude_end?");
@@ -4591,6 +4563,10 @@ SWIG_From_size_t  (size_t value)
   return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
 }
 
+SWIGINTERN std::vector< EveCache::MarketOrder >::iterator std_vector_Sl_EveCache_MarketOrder_Sg__erase__SWIG_0(std::vector< EveCache::MarketOrder > *self,std::vector< EveCache::MarketOrder >::iterator pos){ return self->erase(pos); }
+SWIGINTERN std::vector< EveCache::MarketOrder >::iterator std_vector_Sl_EveCache_MarketOrder_Sg__erase__SWIG_1(std::vector< EveCache::MarketOrder > *self,std::vector< EveCache::MarketOrder >::iterator first,std::vector< EveCache::MarketOrder >::iterator last){ return self->erase(first, last); }
+SWIGINTERN std::vector< EveCache::MarketOrder >::iterator std_vector_Sl_EveCache_MarketOrder_Sg__insert__SWIG_1(std::vector< EveCache::MarketOrder > *self,std::vector< EveCache::MarketOrder >::iterator pos,std::vector< EveCache::MarketOrder >::value_type const &x){ return self->insert(pos, x); }
+SWIGINTERN void std_vector_Sl_EveCache_MarketOrder_Sg__insert__SWIG_2(std::vector< EveCache::MarketOrder > *self,std::vector< EveCache::MarketOrder >::iterator pos,std::vector< EveCache::MarketOrder >::size_type n,std::vector< EveCache::MarketOrder >::value_type const &x){ self->insert(pos, n, x); }
 
 namespace swig {
   template <> struct traits<unsigned char > {
@@ -4714,25 +4690,6 @@ SWIGINTERN std::vector< unsigned char,std::allocator< unsigned char > > *std_vec
 	
       return r;
     }
-SWIGINTERN std::vector< unsigned char,std::allocator< unsigned char > > *std_vector_Sl_unsigned_SS_char_Sg__reject_bang(std::vector< unsigned char > *self){
-      if ( !rb_block_given_p() )
-	rb_raise( rb_eArgError, "no block given" );
-
-      std::vector<unsigned char,std::allocator< unsigned char > >::iterator i = self->begin();
-      std::vector<unsigned char,std::allocator< unsigned char > >::iterator e = self->end();
-      for ( ; i != e; )
-	{
-	  VALUE r = swig::from< std::vector<unsigned char,std::allocator< unsigned char > >::value_type >(*i);
-	  if ( RTEST( rb_yield(r) ) ) {
-	    self->erase(i++);
-            e = self->end();
-	  } else {
-	    ++i;
-          }
-	}
-	
-      return self;
-    }
 SWIGINTERN VALUE std_vector_Sl_unsigned_SS_char_Sg__delete_at(std::vector< unsigned char > *self,std::vector< unsigned char >::difference_type i){
       VALUE r = Qnil;
       try {
@@ -4749,6 +4706,14 @@ SWIGINTERN VALUE std_vector_Sl_unsigned_SS_char_Sg____delete2__(std::vector< uns
       VALUE r = Qnil;
       return r;
     }
+SWIGINTERN std::vector< unsigned char,std::allocator< unsigned char > > *std_vector_Sl_unsigned_SS_char_Sg__reject_bang(std::vector< unsigned char > *self){
+      if ( !rb_block_given_p() )
+	rb_raise( rb_eArgError, "no block given" );
+
+      self->erase( std::remove_if( self->begin(), self->end(),
+            swig::yield< std::vector<unsigned char,std::allocator< unsigned char > >::value_type >() ), self->end() );
+      return self;
+    }
 SWIGINTERN VALUE std_vector_Sl_unsigned_SS_char_Sg__pop(std::vector< unsigned char > *self){
       if (self->empty()) return Qnil;
       std::vector<unsigned char,std::allocator< unsigned char > >::value_type x = self->back();
@@ -4810,7 +4775,6 @@ SWIGINTERN VALUE std_vector_Sl_unsigned_SS_char_Sg____getitem____SWIG_2(std::vec
 	  rb_raise( rb_eTypeError, "not a valid index or range" );
 	}
 
-      VALUE r = Qnil;
       static ID id_end   = rb_intern("end");
       static ID id_start = rb_intern("begin");
       static ID id_noend = rb_intern("exclude_end?");
@@ -4923,6 +4887,10 @@ SWIGINTERN std::vector< unsigned char,std::allocator< unsigned char > > *std_vec
 
       return self;
     }
+SWIGINTERN std::vector< unsigned char >::iterator std_vector_Sl_unsigned_SS_char_Sg__erase__SWIG_0(std::vector< unsigned char > *self,std::vector< unsigned char >::iterator pos){ return self->erase(pos); }
+SWIGINTERN std::vector< unsigned char >::iterator std_vector_Sl_unsigned_SS_char_Sg__erase__SWIG_1(std::vector< unsigned char > *self,std::vector< unsigned char >::iterator first,std::vector< unsigned char >::iterator last){ return self->erase(first, last); }
+SWIGINTERN std::vector< unsigned char >::iterator std_vector_Sl_unsigned_SS_char_Sg__insert__SWIG_1(std::vector< unsigned char > *self,std::vector< unsigned char >::iterator pos,std::vector< unsigned char >::value_type const &x){ return self->insert(pos, x); }
+SWIGINTERN void std_vector_Sl_unsigned_SS_char_Sg__insert__SWIG_2(std::vector< unsigned char > *self,std::vector< unsigned char >::iterator pos,std::vector< unsigned char >::size_type n,std::vector< unsigned char >::value_type const &x){ self->insert(pos, n, x); }
 static swig_class SwigClassGC_VALUE;
 
 
@@ -6177,7 +6145,7 @@ _wrap_new_SNode__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "EveCache::EStreamCode","EveCache::SNode", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "EveCache::EStreamCode","SNode", 1, argv[0] ));
   } 
   arg1 = static_cast< EveCache::EStreamCode >(val1);
   result = (EveCache::SNode *)new EveCache::SNode(arg1);
@@ -6217,10 +6185,10 @@ _wrap_new_SNode__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1, SWIGTYPE_p_EveCache__SNode,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::SNode const &","EveCache::SNode", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::SNode const &","SNode", 1, argv[0] )); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::SNode const &","EveCache::SNode", 1, argv[0])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::SNode const &","SNode", 1, argv[0])); 
   }
   arg1 = reinterpret_cast< EveCache::SNode * >(argp1);
   result = (EveCache::SNode *)new EveCache::SNode((EveCache::SNode const &)*arg1);
@@ -6467,7 +6435,7 @@ _wrap_new_SStreamNode__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "EveCache::EStreamCode","EveCache::SStreamNode", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "EveCache::EStreamCode","SStreamNode", 1, argv[0] ));
   } 
   arg1 = static_cast< EveCache::EStreamCode >(val1);
   result = (EveCache::SStreamNode *)new EveCache::SStreamNode(arg1);
@@ -6507,10 +6475,10 @@ _wrap_new_SStreamNode__SWIG_2(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1, SWIGTYPE_p_EveCache__SStreamNode,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::SStreamNode const &","EveCache::SStreamNode", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::SStreamNode const &","SStreamNode", 1, argv[0] )); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::SStreamNode const &","EveCache::SStreamNode", 1, argv[0])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::SStreamNode const &","SStreamNode", 1, argv[0])); 
   }
   arg1 = reinterpret_cast< EveCache::SStreamNode * >(argp1);
   result = (EveCache::SStreamNode *)new EveCache::SStreamNode((EveCache::SStreamNode const &)*arg1);
@@ -6736,7 +6704,7 @@ _wrap_new_STuple__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_unsigned_SS_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "unsigned int","EveCache::STuple", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "unsigned int","STuple", 1, argv[0] ));
   } 
   arg1 = static_cast< unsigned int >(val1);
   result = (EveCache::STuple *)new EveCache::STuple(arg1);
@@ -6776,10 +6744,10 @@ _wrap_new_STuple__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1, SWIGTYPE_p_EveCache__STuple,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::STuple const &","EveCache::STuple", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::STuple const &","STuple", 1, argv[0] )); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::STuple const &","EveCache::STuple", 1, argv[0])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::STuple const &","STuple", 1, argv[0])); 
   }
   arg1 = reinterpret_cast< EveCache::STuple * >(argp1);
   result = (EveCache::STuple *)new EveCache::STuple((EveCache::STuple const &)*arg1);
@@ -6958,7 +6926,7 @@ _wrap_new_SDict__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_unsigned_SS_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "unsigned int","EveCache::SDict", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "unsigned int","SDict", 1, argv[0] ));
   } 
   arg1 = static_cast< unsigned int >(val1);
   result = (EveCache::SDict *)new EveCache::SDict(arg1);
@@ -6998,10 +6966,10 @@ _wrap_new_SDict__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1, SWIGTYPE_p_EveCache__SDict,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::SDict const &","EveCache::SDict", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::SDict const &","SDict", 1, argv[0] )); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::SDict const &","EveCache::SDict", 1, argv[0])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::SDict const &","SDict", 1, argv[0])); 
   }
   arg1 = reinterpret_cast< EveCache::SDict * >(argp1);
   result = (EveCache::SDict *)new EveCache::SDict((EveCache::SDict const &)*arg1);
@@ -7332,7 +7300,7 @@ _wrap_new_SMarker(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_unsigned_SS_char(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "unsigned char","EveCache::SMarker", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "unsigned char","SMarker", 1, argv[0] ));
   } 
   arg1 = static_cast< unsigned char >(val1);
   result = (EveCache::SMarker *)new EveCache::SMarker(arg1);
@@ -7485,10 +7453,10 @@ _wrap_new_SIdent(int argc, VALUE *argv, VALUE self) {
     std::string *ptr = (std::string *)0;
     res1 = SWIG_AsPtr_std_string(argv[0], &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::string const &","EveCache::SIdent", 1, argv[0] )); 
+      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::string const &","SIdent", 1, argv[0] )); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::string const &","EveCache::SIdent", 1, argv[0])); 
+      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::string const &","SIdent", 1, argv[0])); 
     }
     arg1 = ptr;
   }
@@ -7620,10 +7588,10 @@ _wrap_new_SString(int argc, VALUE *argv, VALUE self) {
     std::string *ptr = (std::string *)0;
     res1 = SWIG_AsPtr_std_string(argv[0], &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::string const &","EveCache::SString", 1, argv[0] )); 
+      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::string const &","SString", 1, argv[0] )); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::string const &","EveCache::SString", 1, argv[0])); 
+      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::string const &","SString", 1, argv[0])); 
     }
     arg1 = ptr;
   }
@@ -7754,7 +7722,7 @@ _wrap_new_SInt(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","EveCache::SInt", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","SInt", 1, argv[0] ));
   } 
   arg1 = static_cast< int >(val1);
   result = (EveCache::SInt *)new EveCache::SInt(arg1);
@@ -7882,7 +7850,7 @@ _wrap_new_SReal(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_double(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","EveCache::SReal", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","SReal", 1, argv[0] ));
   } 
   arg1 = static_cast< double >(val1);
   result = (EveCache::SReal *)new EveCache::SReal(arg1);
@@ -8010,7 +7978,7 @@ _wrap_new_SLongLong(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_long_SS_long(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "long long","EveCache::SLongLong", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "long long","SLongLong", 1, argv[0] ));
   } 
   arg1 = static_cast< long long >(val1);
   result = (EveCache::SLongLong *)new EveCache::SLongLong(arg1);
@@ -8258,7 +8226,7 @@ _wrap_new_SSubstream(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","EveCache::SSubstream", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","SSubstream", 1, argv[0] ));
   } 
   arg1 = static_cast< int >(val1);
   result = (EveCache::SSubstream *)new EveCache::SSubstream(arg1);
@@ -8365,15 +8333,15 @@ _wrap_new_SDBRow(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","EveCache::SDBRow", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","SDBRow", 1, argv[0] ));
   } 
   arg1 = static_cast< int >(val1);
   res2 = SWIG_ConvertPtr(argv[1], &argp2, SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "std::vector< unsigned char,std::allocator< unsigned char > > const &","EveCache::SDBRow", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "std::vector< unsigned char,std::allocator< unsigned char > > const &","SDBRow", 2, argv[1] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< unsigned char,std::allocator< unsigned char > > const &","EveCache::SDBRow", 2, argv[1])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< unsigned char,std::allocator< unsigned char > > const &","SDBRow", 2, argv[1])); 
   }
   arg2 = reinterpret_cast< std::vector< unsigned char,std::allocator< unsigned char > > * >(argp2);
   result = (EveCache::SDBRow *)new EveCache::SDBRow(arg1,(std::vector< unsigned char,std::allocator< unsigned char > > const &)*arg2);
@@ -8626,7 +8594,7 @@ _wrap_new_Parser(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_EveCache__CacheFile_Iterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::CacheFile_Iterator *","EveCache::Parser", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::CacheFile_Iterator *","Parser", 1, argv[0] )); 
   }
   arg1 = reinterpret_cast< EveCache::CacheFile_Iterator * >(argp1);
   result = (EveCache::Parser *)new EveCache::Parser(arg1);
@@ -9509,12 +9477,12 @@ _wrap_new_MarketList__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","EveCache::MarketList", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","MarketList", 1, argv[0] ));
   } 
   arg1 = static_cast< int >(val1);
   ecode2 = SWIG_AsVal_int(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","EveCache::MarketList", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","MarketList", 2, argv[1] ));
   } 
   arg2 = static_cast< int >(val2);
   result = (EveCache::MarketList *)new EveCache::MarketList(arg1,arg2);
@@ -9569,10 +9537,10 @@ _wrap_new_MarketList__SWIG_2(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1, SWIGTYPE_p_EveCache__MarketList,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::MarketList const &","EveCache::MarketList", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::MarketList const &","MarketList", 1, argv[0] )); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::MarketList const &","EveCache::MarketList", 1, argv[0])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::MarketList const &","MarketList", 1, argv[0])); 
   }
   arg1 = reinterpret_cast< EveCache::MarketList * >(argp1);
   result = (EveCache::MarketList *)new EveCache::MarketList((EveCache::MarketList const &)*arg1);
@@ -9890,7 +9858,7 @@ _wrap_new_MarketParser__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_EveCache__SNode, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::SNode const *","EveCache::MarketParser", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::SNode const *","MarketParser", 1, argv[0] )); 
   }
   arg1 = reinterpret_cast< EveCache::SNode * >(argp1);
   result = (EveCache::MarketParser *)new EveCache::MarketParser((EveCache::SNode const *)arg1);
@@ -9988,7 +9956,7 @@ _wrap_new_MarketParser__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","EveCache::MarketParser", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","MarketParser", 1, argv[0] ));
   }
   arg1 = reinterpret_cast< char * >(buf1);
   result = (EveCache::MarketParser *)new EveCache::MarketParser((char const *)arg1);
@@ -10030,7 +9998,7 @@ _wrap_new_MarketParser__SWIG_2(int argc, VALUE *argv, VALUE self) {
     std::string *ptr = (std::string *)0;
     int res = SWIG_AsPtr_std_string(argv[0], &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), Ruby_Format_TypeError( "", "std::string const","EveCache::MarketParser", 1, argv[0] )); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), Ruby_Format_TypeError( "", "std::string const","MarketParser", 1, argv[0] )); 
     }
     arg1 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
@@ -10104,10 +10072,10 @@ _wrap_new_CacheFile__SWIG_0(int argc, VALUE *argv, VALUE self) {
     std::string *ptr = (std::string *)0;
     res1 = SWIG_AsPtr_std_string(argv[0], &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::string const &","EveCache::CacheFile", 1, argv[0] )); 
+      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::string const &","CacheFile", 1, argv[0] )); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::string const &","EveCache::CacheFile", 1, argv[0])); 
+      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::string const &","CacheFile", 1, argv[0])); 
     }
     arg1 = ptr;
   }
@@ -10133,10 +10101,10 @@ _wrap_new_CacheFile__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1, SWIGTYPE_p_EveCache__CacheFile,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::CacheFile const &","EveCache::CacheFile", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::CacheFile const &","CacheFile", 1, argv[0] )); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::CacheFile const &","EveCache::CacheFile", 1, argv[0])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::CacheFile const &","CacheFile", 1, argv[0])); 
   }
   arg1 = reinterpret_cast< EveCache::CacheFile * >(argp1);
   result = (EveCache::CacheFile *)new EveCache::CacheFile((EveCache::CacheFile const &)*arg1);
@@ -10176,10 +10144,10 @@ _wrap_new_CacheFile__SWIG_2(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1, SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::vector< unsigned char,std::allocator< unsigned char > > &","EveCache::CacheFile", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::vector< unsigned char,std::allocator< unsigned char > > &","CacheFile", 1, argv[0] )); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< unsigned char,std::allocator< unsigned char > > &","EveCache::CacheFile", 1, argv[0])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< unsigned char,std::allocator< unsigned char > > &","CacheFile", 1, argv[0])); 
   }
   arg1 = reinterpret_cast< std::vector< unsigned char,std::allocator< unsigned char > > * >(argp1);
   result = (EveCache::CacheFile *)new EveCache::CacheFile(*arg1);
@@ -10453,17 +10421,17 @@ _wrap_new_CacheFile_Iterator__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_EveCache__CacheFile, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::CacheFile const *","EveCache::CacheFile_Iterator", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::CacheFile const *","CacheFile_Iterator", 1, argv[0] )); 
   }
   arg1 = reinterpret_cast< EveCache::CacheFile * >(argp1);
   ecode2 = SWIG_AsVal_int(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","EveCache::CacheFile_Iterator", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","CacheFile_Iterator", 2, argv[1] ));
   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(argv[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","EveCache::CacheFile_Iterator", 3, argv[2] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","CacheFile_Iterator", 3, argv[2] ));
   } 
   arg3 = static_cast< int >(val3);
   result = (EveCache::CacheFile_Iterator *)new EveCache::CacheFile_Iterator((EveCache::CacheFile const *)arg1,arg2,arg3);
@@ -10503,10 +10471,10 @@ _wrap_new_CacheFile_Iterator__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1, SWIGTYPE_p_EveCache__CacheFile_Iterator,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::CacheFile_Iterator const &","EveCache::CacheFile_Iterator", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "EveCache::CacheFile_Iterator const &","CacheFile_Iterator", 1, argv[0] )); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::CacheFile_Iterator const &","EveCache::CacheFile_Iterator", 1, argv[0])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "EveCache::CacheFile_Iterator const &","CacheFile_Iterator", 1, argv[0])); 
   }
   arg1 = reinterpret_cast< EveCache::CacheFile_Iterator * >(argp1);
   result = (EveCache::CacheFile_Iterator *)new EveCache::CacheFile_Iterator((EveCache::CacheFile_Iterator const &)*arg1);
@@ -11356,39 +11324,6 @@ fail:
 
 
 
-/*
-  Document-method: Evecache::MarketOrderVector.reject!
-
-  call-seq:
-    reject! -> MarketOrderVector
-
-Iterate thru each element in the MarketOrderVector and reject those that fail a condition.  A block must be provided.  MarketOrderVector is modified in place.
-*/
-SWIGINTERN VALUE
-_wrap_MarketOrderVector_rejectN___(int argc, VALUE *argv, VALUE self) {
-  std::vector< EveCache::MarketOrder > *arg1 = (std::vector< EveCache::MarketOrder > *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  std::vector< EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > > *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_std__vectorT_EveCache__MarketOrder_std__allocatorT_EveCache__MarketOrder_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder > *","reject_bang", 1, self )); 
-  }
-  arg1 = reinterpret_cast< std::vector< EveCache::MarketOrder > * >(argp1);
-  result = (std::vector< EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > > *)std_vector_Sl_EveCache_MarketOrder_Sg__reject_bang(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_EveCache__MarketOrder_std__allocatorT_EveCache__MarketOrder_t_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-
 /*
   Document-method: Evecache::MarketOrderVector.delete_at
 
@@ -11465,6 +11400,39 @@ fail:
 
 
 
+/*
+  Document-method: Evecache::MarketOrderVector.reject!
+
+  call-seq:
+    reject! -> MarketOrderVector
+
+Iterate thru each element in the MarketOrderVector and reject those that fail a condition.  A block must be provided.  MarketOrderVector is modified in place.
+*/
+SWIGINTERN VALUE
+_wrap_MarketOrderVector_rejectN___(int argc, VALUE *argv, VALUE self) {
+  std::vector< EveCache::MarketOrder > *arg1 = (std::vector< EveCache::MarketOrder > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  std::vector< EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > > *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_std__vectorT_EveCache__MarketOrder_std__allocatorT_EveCache__MarketOrder_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder > *","reject_bang", 1, self )); 
+  }
+  arg1 = reinterpret_cast< std::vector< EveCache::MarketOrder > * >(argp1);
+  result = (std::vector< EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > > *)std_vector_Sl_EveCache_MarketOrder_Sg__reject_bang(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_EveCache__MarketOrder_std__allocatorT_EveCache__MarketOrder_t_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
 /*
   Document-method: Evecache::MarketOrderVector.pop
 
@@ -12120,10 +12088,10 @@ _wrap_new_MarketOrderVector__SWIG_1(int argc, VALUE *argv, VALUE self) {
     std::vector<EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > > *ptr = (std::vector<EveCache::MarketOrder,std::allocator< EveCache::MarketOrder > > *)0;
     res1 = swig::asptr(argv[0], &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder > const &","std::vector<(EveCache::MarketOrder)>", 1, argv[0] )); 
+      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder > const &","vector<(EveCache::MarketOrder)>", 1, argv[0] )); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< EveCache::MarketOrder > const &","std::vector<(EveCache::MarketOrder)>", 1, argv[0])); 
+      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< EveCache::MarketOrder > const &","vector<(EveCache::MarketOrder)>", 1, argv[0])); 
     }
     arg1 = ptr;
   }
@@ -12441,7 +12409,7 @@ _wrap_new_MarketOrderVector__SWIG_2(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_size_t(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder >::size_type","std::vector<(EveCache::MarketOrder)>", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder >::size_type","vector<(EveCache::MarketOrder)>", 1, argv[0] ));
   } 
   arg1 = static_cast< std::vector< EveCache::MarketOrder >::size_type >(val1);
   result = (std::vector< EveCache::MarketOrder > *)new std::vector< EveCache::MarketOrder >(arg1);
@@ -12531,7 +12499,7 @@ _wrap_MarketOrderVector_erase__SWIG_0(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder >::iterator","erase", 2, argv[0] ));
     }
   }
-  result = (arg1)->erase(arg2);
+  result = std_vector_Sl_EveCache_MarketOrder_Sg__erase__SWIG_0(arg1,arg2);
   vresult = SWIG_NewPointerObj(swig::make_nonconst_iterator(static_cast< const std::vector< EveCache::MarketOrder >::iterator & >(result),
       self),
     swig::Iterator::descriptor(),SWIG_POINTER_OWN);
@@ -12585,7 +12553,7 @@ _wrap_MarketOrderVector_erase__SWIG_1(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder >::iterator","erase", 3, argv[1] ));
     }
   }
-  result = (arg1)->erase(arg2,arg3);
+  result = std_vector_Sl_EveCache_MarketOrder_Sg__erase__SWIG_1(arg1,arg2,arg3);
   vresult = SWIG_NewPointerObj(swig::make_nonconst_iterator(static_cast< const std::vector< EveCache::MarketOrder >::iterator & >(result),
       self),
     swig::Iterator::descriptor(),SWIG_POINTER_OWN);
@@ -12642,9 +12610,9 @@ SWIGINTERN VALUE _wrap_MarketOrderVector_erase(int nargs, VALUE *args, VALUE sel
   }
   
 fail:
-  Ruby_Format_OverloadedError( argc, 4, "MarketOrderVector.erase", 
-    "    std::vector< EveCache::MarketOrder >::iterator MarketOrderVector.erase(std::vector< EveCache::MarketOrder >::iterator pos)\n"
-    "    std::vector< EveCache::MarketOrder >::iterator MarketOrderVector.erase(std::vector< EveCache::MarketOrder >::iterator first, std::vector< EveCache::MarketOrder >::iterator last)\n");
+  Ruby_Format_OverloadedError( argc, 4, "erase", 
+    "    std::vector< EveCache::MarketOrder >::iterator erase(std::vector< EveCache::MarketOrder >::iterator pos)\n"
+    "    std::vector< EveCache::MarketOrder >::iterator erase(std::vector< EveCache::MarketOrder >::iterator first, std::vector< EveCache::MarketOrder >::iterator last)\n");
   
   return Qnil;
 }
@@ -12682,15 +12650,15 @@ _wrap_new_MarketOrderVector__SWIG_3(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_size_t(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder >::size_type","std::vector<(EveCache::MarketOrder)>", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder >::size_type","vector<(EveCache::MarketOrder)>", 1, argv[0] ));
   } 
   arg1 = static_cast< std::vector< EveCache::MarketOrder >::size_type >(val1);
   res2 = SWIG_ConvertPtr(argv[1], &argp2, SWIGTYPE_p_EveCache__MarketOrder,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder >::value_type const &","std::vector<(EveCache::MarketOrder)>", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "std::vector< EveCache::MarketOrder >::value_type const &","vector<(EveCache::MarketOrder)>", 2, argv[1] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< EveCache::MarketOrder >::value_type const &","std::vector<(EveCache::MarketOrder)>", 2, argv[1])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< EveCache::MarketOrder >::value_type const &","vector<(EveCache::MarketOrder)>", 2, argv[1])); 
   }
   arg2 = reinterpret_cast< std::vector< EveCache::MarketOrder >::value_type * >(argp2);
   result = (std::vector< EveCache::MarketOrder > *)new std::vector< EveCache::MarketOrder >(arg1,(std::vector< EveCache::MarketOrder >::value_type const &)*arg2);
@@ -13030,7 +12998,7 @@ _wrap_MarketOrderVector_insert__SWIG_1(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< EveCache::MarketOrder >::value_type const &","insert", 3, argv[1])); 
   }
   arg3 = reinterpret_cast< std::vector< EveCache::MarketOrder >::value_type * >(argp3);
-  result = (arg1)->insert(arg2,(std::vector< EveCache::MarketOrder >::value_type const &)*arg3);
+  result = std_vector_Sl_EveCache_MarketOrder_Sg__insert__SWIG_1(arg1,arg2,(EveCache::MarketOrder const &)*arg3);
   vresult = SWIG_NewPointerObj(swig::make_nonconst_iterator(static_cast< const std::vector< EveCache::MarketOrder >::iterator & >(result),
       self),
     swig::Iterator::descriptor(),SWIG_POINTER_OWN);
@@ -13087,7 +13055,7 @@ _wrap_MarketOrderVector_insert__SWIG_2(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< EveCache::MarketOrder >::value_type const &","insert", 4, argv[2])); 
   }
   arg4 = reinterpret_cast< std::vector< EveCache::MarketOrder >::value_type * >(argp4);
-  (arg1)->insert(arg2,arg3,(std::vector< EveCache::MarketOrder >::value_type const &)*arg4);
+  std_vector_Sl_EveCache_MarketOrder_Sg__insert__SWIG_2(arg1,arg2,arg3,(EveCache::MarketOrder const &)*arg4);
   return Qnil;
 fail:
   return Qnil;
@@ -13509,39 +13477,6 @@ fail:
 
 
 
-/*
-  Document-method: Evecache::UnsignedCharVector.reject!
-
-  call-seq:
-    reject! -> UnsignedCharVector
-
-Iterate thru each element in the UnsignedCharVector and reject those that fail a condition.  A block must be provided.  UnsignedCharVector is modified in place.
-*/
-SWIGINTERN VALUE
-_wrap_UnsignedCharVector_rejectN___(int argc, VALUE *argv, VALUE self) {
-  std::vector< unsigned char > *arg1 = (std::vector< unsigned char > *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  std::vector< unsigned char,std::allocator< unsigned char > > *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::vector< unsigned char > *","reject_bang", 1, self )); 
-  }
-  arg1 = reinterpret_cast< std::vector< unsigned char > * >(argp1);
-  result = (std::vector< unsigned char,std::allocator< unsigned char > > *)std_vector_Sl_unsigned_SS_char_Sg__reject_bang(arg1);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-
 /*
   Document-method: Evecache::UnsignedCharVector.delete_at
 
@@ -13617,6 +13552,39 @@ fail:
 
 
 
+/*
+  Document-method: Evecache::UnsignedCharVector.reject!
+
+  call-seq:
+    reject! -> UnsignedCharVector
+
+Iterate thru each element in the UnsignedCharVector and reject those that fail a condition.  A block must be provided.  UnsignedCharVector is modified in place.
+*/
+SWIGINTERN VALUE
+_wrap_UnsignedCharVector_rejectN___(int argc, VALUE *argv, VALUE self) {
+  std::vector< unsigned char > *arg1 = (std::vector< unsigned char > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  std::vector< unsigned char,std::allocator< unsigned char > > *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::vector< unsigned char > *","reject_bang", 1, self )); 
+  }
+  arg1 = reinterpret_cast< std::vector< unsigned char > * >(argp1);
+  result = (std::vector< unsigned char,std::allocator< unsigned char > > *)std_vector_Sl_unsigned_SS_char_Sg__reject_bang(arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_unsigned_char_std__allocatorT_unsigned_char_t_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
 /*
   Document-method: Evecache::UnsignedCharVector.pop
 
@@ -14271,10 +14239,10 @@ _wrap_new_UnsignedCharVector__SWIG_1(int argc, VALUE *argv, VALUE self) {
     std::vector<unsigned char,std::allocator< unsigned char > > *ptr = (std::vector<unsigned char,std::allocator< unsigned char > > *)0;
     res1 = swig::asptr(argv[0], &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::vector< unsigned char > const &","std::vector<(unsigned char)>", 1, argv[0] )); 
+      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::vector< unsigned char > const &","vector<(unsigned char)>", 1, argv[0] )); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< unsigned char > const &","std::vector<(unsigned char)>", 1, argv[0])); 
+      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::vector< unsigned char > const &","vector<(unsigned char)>", 1, argv[0])); 
     }
     arg1 = ptr;
   }
@@ -14592,7 +14560,7 @@ _wrap_new_UnsignedCharVector__SWIG_2(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_size_t(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::vector< unsigned char >::size_type","std::vector<(unsigned char)>", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::vector< unsigned char >::size_type","vector<(unsigned char)>", 1, argv[0] ));
   } 
   arg1 = static_cast< std::vector< unsigned char >::size_type >(val1);
   result = (std::vector< unsigned char > *)new std::vector< unsigned char >(arg1);
@@ -14682,7 +14650,7 @@ _wrap_UnsignedCharVector_erase__SWIG_0(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), Ruby_Format_TypeError( "", "std::vector< unsigned char >::iterator","erase", 2, argv[0] ));
     }
   }
-  result = (arg1)->erase(arg2);
+  result = std_vector_Sl_unsigned_SS_char_Sg__erase__SWIG_0(arg1,arg2);
   vresult = SWIG_NewPointerObj(swig::make_nonconst_iterator(static_cast< const std::vector< unsigned char >::iterator & >(result),
       self),
     swig::Iterator::descriptor(),SWIG_POINTER_OWN);
@@ -14736,7 +14704,7 @@ _wrap_UnsignedCharVector_erase__SWIG_1(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), Ruby_Format_TypeError( "", "std::vector< unsigned char >::iterator","erase", 3, argv[1] ));
     }
   }
-  result = (arg1)->erase(arg2,arg3);
+  result = std_vector_Sl_unsigned_SS_char_Sg__erase__SWIG_1(arg1,arg2,arg3);
   vresult = SWIG_NewPointerObj(swig::make_nonconst_iterator(static_cast< const std::vector< unsigned char >::iterator & >(result),
       self),
     swig::Iterator::descriptor(),SWIG_POINTER_OWN);
@@ -14793,9 +14761,9 @@ SWIGINTERN VALUE _wrap_UnsignedCharVector_erase(int nargs, VALUE *args, VALUE se
   }
   
 fail:
-  Ruby_Format_OverloadedError( argc, 4, "UnsignedCharVector.erase", 
-    "    std::vector< unsigned char >::iterator UnsignedCharVector.erase(std::vector< unsigned char >::iterator pos)\n"
-    "    std::vector< unsigned char >::iterator UnsignedCharVector.erase(std::vector< unsigned char >::iterator first, std::vector< unsigned char >::iterator last)\n");
+  Ruby_Format_OverloadedError( argc, 4, "erase", 
+    "    std::vector< unsigned char >::iterator erase(std::vector< unsigned char >::iterator pos)\n"
+    "    std::vector< unsigned char >::iterator erase(std::vector< unsigned char >::iterator first, std::vector< unsigned char >::iterator last)\n");
   
   return Qnil;
 }
@@ -14834,12 +14802,12 @@ _wrap_new_UnsignedCharVector__SWIG_3(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_size_t(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::vector< unsigned char >::size_type","std::vector<(unsigned char)>", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::vector< unsigned char >::size_type","vector<(unsigned char)>", 1, argv[0] ));
   } 
   arg1 = static_cast< std::vector< unsigned char >::size_type >(val1);
   ecode2 = SWIG_AsVal_unsigned_SS_char(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "std::vector< unsigned char >::value_type","std::vector<(unsigned char)>", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "std::vector< unsigned char >::value_type","vector<(unsigned char)>", 2, argv[1] ));
   } 
   temp2 = static_cast< std::vector< unsigned char >::value_type >(val2);
   arg2 = &temp2;
@@ -15179,7 +15147,7 @@ _wrap_UnsignedCharVector_insert__SWIG_1(int argc, VALUE *argv, VALUE self) {
   } 
   temp3 = static_cast< std::vector< unsigned char >::value_type >(val3);
   arg3 = &temp3;
-  result = (arg1)->insert(arg2,(std::vector< unsigned char >::value_type const &)*arg3);
+  result = std_vector_Sl_unsigned_SS_char_Sg__insert__SWIG_1(arg1,arg2,(unsigned char const &)*arg3);
   vresult = SWIG_NewPointerObj(swig::make_nonconst_iterator(static_cast< const std::vector< unsigned char >::iterator & >(result),
       self),
     swig::Iterator::descriptor(),SWIG_POINTER_OWN);
@@ -15235,7 +15203,7 @@ _wrap_UnsignedCharVector_insert__SWIG_2(int argc, VALUE *argv, VALUE self) {
   } 
   temp4 = static_cast< std::vector< unsigned char >::value_type >(val4);
   arg4 = &temp4;
-  (arg1)->insert(arg2,arg3,(std::vector< unsigned char >::value_type const &)*arg4);
+  std_vector_Sl_unsigned_SS_char_Sg__insert__SWIG_2(arg1,arg2,arg3,(unsigned char const &)*arg4);
   return Qnil;
 fail:
   return Qnil;
@@ -15629,18 +15597,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned statically to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -15650,17 +15618,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -15686,8 +15654,6 @@ SWIG_InitializeModule(void *clientdata) {
   swig_module_info *module_head, *iter;
   int found, init;
 
-  clientdata = clientdata;
-
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {
     /* Initialize the swig_module */
@@ -15725,7 +15691,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -15739,7 +15705,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -15766,7 +15732,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
@@ -15891,7 +15857,7 @@ SWIGEXPORT void Init_evecache(void) {
   SwigClassGC_VALUE.mark = 0;
   SwigClassGC_VALUE.trackObjects = 0;
   
-  swig::GC_VALUE::initialize();
+  swig::SwigGCReferences::initialize();
   
   
   SwigClassConstIterator.klass = rb_define_class_under(mEvecache, "ConstIterator", rb_cObject);
@@ -16271,10 +16237,10 @@ SWIGEXPORT void Init_evecache(void) {
   rb_define_method(SwigClassMarketOrderVector.klass, "slice", VALUEFUNC(_wrap_MarketOrderVector_slice), -1);
   rb_define_method(SwigClassMarketOrderVector.klass, "each", VALUEFUNC(_wrap_MarketOrderVector_each), -1);
   rb_define_method(SwigClassMarketOrderVector.klass, "select", VALUEFUNC(_wrap_MarketOrderVector_select), -1);
-  rb_define_method(SwigClassMarketOrderVector.klass, "reject!", VALUEFUNC(_wrap_MarketOrderVector_rejectN___), -1);
-  rb_define_alias(SwigClassMarketOrderVector.klass, "delete_if", "reject!");
   rb_define_method(SwigClassMarketOrderVector.klass, "delete_at", VALUEFUNC(_wrap_MarketOrderVector_delete_at), -1);
   rb_define_method(SwigClassMarketOrderVector.klass, "__delete2__", VALUEFUNC(_wrap_MarketOrderVector___delete2__), -1);
+  rb_define_method(SwigClassMarketOrderVector.klass, "reject!", VALUEFUNC(_wrap_MarketOrderVector_rejectN___), -1);
+  rb_define_alias(SwigClassMarketOrderVector.klass, "delete_if", "reject!");
   rb_define_method(SwigClassMarketOrderVector.klass, "pop", VALUEFUNC(_wrap_MarketOrderVector_pop), -1);
   rb_define_method(SwigClassMarketOrderVector.klass, "push", VALUEFUNC(_wrap_MarketOrderVector_push), -1);
   rb_define_alias(SwigClassMarketOrderVector.klass, "<<", "push");
@@ -16317,10 +16283,10 @@ SWIGEXPORT void Init_evecache(void) {
   rb_define_method(SwigClassUnsignedCharVector.klass, "slice", VALUEFUNC(_wrap_UnsignedCharVector_slice), -1);
   rb_define_method(SwigClassUnsignedCharVector.klass, "each", VALUEFUNC(_wrap_UnsignedCharVector_each), -1);
   rb_define_method(SwigClassUnsignedCharVector.klass, "select", VALUEFUNC(_wrap_UnsignedCharVector_select), -1);
-  rb_define_method(SwigClassUnsignedCharVector.klass, "reject!", VALUEFUNC(_wrap_UnsignedCharVector_rejectN___), -1);
-  rb_define_alias(SwigClassUnsignedCharVector.klass, "delete_if", "reject!");
   rb_define_method(SwigClassUnsignedCharVector.klass, "delete_at", VALUEFUNC(_wrap_UnsignedCharVector_delete_at), -1);
   rb_define_method(SwigClassUnsignedCharVector.klass, "__delete2__", VALUEFUNC(_wrap_UnsignedCharVector___delete2__), -1);
+  rb_define_method(SwigClassUnsignedCharVector.klass, "reject!", VALUEFUNC(_wrap_UnsignedCharVector_rejectN___), -1);
+  rb_define_alias(SwigClassUnsignedCharVector.klass, "delete_if", "reject!");
   rb_define_method(SwigClassUnsignedCharVector.klass, "pop", VALUEFUNC(_wrap_UnsignedCharVector_pop), -1);
   rb_define_method(SwigClassUnsignedCharVector.klass, "push", VALUEFUNC(_wrap_UnsignedCharVector_push), -1);
   rb_define_alias(SwigClassUnsignedCharVector.klass, "<<", "push");