rice 2.1.0 → 3.0.0

data/configure.ac

@@ -21,8 +21,8 @@ else
   RICE_USING_MINGW32="false"
 fi
 
-m4_include(check_stdcxx_11.ac)
-AX_CXX_COMPILE_STDCXX_11(,optional)
+m4_include(ax_cxx_compile_stdcxx.m4)
+AX_CXX_COMPILE_STDCXX(14, noext, mandatory)
 
 AC_SUBST(RICE_USING_MINGW32)
 
@@ -40,7 +40,7 @@ DX_PDF_FEATURE(OFF)
 DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN(rice, Doxyfile, doc)
 
-RICE_SAMPLES="enum map inheritance"
+RICE_SAMPLES="enum map inheritance callbacks"
 AC_SUBST(RICE_SAMPLES)
 
 RICE_ROOT=`pwd`

data/extconf.rb

@@ -23,18 +23,15 @@ if RbConfig::CONFIG["ENABLE_SHARED"] == "no"
 Unfortunately Rice does not build against a staticly linked Ruby.
 You'll need to rebuild Ruby with --enable-shared to use this library.
 
-If you're on rvm:   rvm reinstall [version] -- --enable-shared
-If you're on rbenv: CONFIGURE_OPTS="--enable-shared" rbenv install [version]
-
-If you are using Heroku, they use a own custom configured, staticly linked Ruby
-for their stack and it unfortunately does not work with Rice. You will need to use
-a custom Ruby build pack that builds and uses a non-static version of Ruby.
+If you're on rvm:    rvm reinstall [version] -- --enable-shared
+If you're on rbenv:  CONFIGURE_OPTS="--enable-shared" rbenv install [version]
+If you're on Heroku: upgrade your stack to heroku-16 or later
 EOC
 end
 
 if RUBY_PLATFORM =~ /darwin(\d+)/
-  # TY Nokogiri!
-  if !File.exist?('/usr/include/iconv.h')
+  check_iconv = 'echo "#include <iconv.h>" | g++ -xc -fsyntax-only -'
+  if !system(check_iconv)
     abort <<EOM.chomp
 -----
 The file "/usr/include/iconv.h" is missing in your build environment,
@@ -58,11 +55,15 @@ EOM
     end
 
     other_opts = "--disable-dependency-tracking"
-    env = "ARCHFLAGS='-arch #{arch}' CPPFLAGS='-arch #{arch}'"
   else
     arch = `uname -p`.chomp
-    env = "ARCHFLAGS='-arch #{arch}' CPPFLAGS='-arch #{arch}'"
   end
+
+  env = if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+          "ARCHFLAGS='-arch #{arch}' CPPFLAGS='-fdeclspec -arch #{arch}'"
+        else
+          "ARCHFLAGS='-arch #{arch}' CPPFLAGS='-arch #{arch}'"
+        end
 end
 
 system "sh bootstrap"

data/rice/Array.hpp

@@ -46,12 +46,12 @@ public:
   //! Construct an Array from a C array.
   /*! \param a a C array of type T and size n.
    */
-  template<typename T, size_t n>
+  template<typename T, long n>
   Array(T const (& a)[n]);
 
 public:
   //! Return the size of the array.
-  size_t size() const;
+  long size() const;
 
   //! Return the element at the given index.
   /*! \param index The index of the desired element.  The index may be
@@ -59,7 +59,7 @@ public:
    *  index is out of bounds, this function has undefined behavior.
    *  \return the element at the given index.
    */
-  Object operator[](ptrdiff_t index) const;
+  Object operator[](long index) const;
 
 private:
   //! A helper class so array[index]=value can work.
@@ -72,7 +72,7 @@ public:
    *  index is out of bounds, this function has undefined behavior.
    *  \return the element at the given index.
    */
-  Proxy operator[](ptrdiff_t index);
+  Proxy operator[](long index);
 
   //! Push an element onto the end of the array
   /*! \param v an object to push onto the array.
@@ -103,7 +103,7 @@ private:
   template<typename Array_Ref_T, typename Value_T>
   class Iterator;
 
-  size_t position_of(ptrdiff_t index) const;
+  long position_of(long index) const;
 
 public:
   //! An iterator.
@@ -130,7 +130,7 @@ class Array::Proxy
 {
 public:
   //! Construct a new Proxy
-  Proxy(Array array, size_t index);
+  Proxy(Array array, long index);
 
   //! Implicit conversion to Object.
   operator Object() const;
@@ -144,22 +144,22 @@ public:
 
 private:
   Array array_;
-  size_t index_;
+  long index_;
 };
 
 //! A helper class for implementing iterators for a Array.
 // TODO: This really should be a random-access iterator.
 template<typename Array_Ref_T, typename Value_T>
 class Array::Iterator
-  : public std::iterator<
-      std::forward_iterator_tag,
-      Value_T,            // Type
-      ptrdiff_t,          // Distance type
-      Object *,           // Pointer type
-      Value_T &>          // Reference type
 {
 public:
-  Iterator(Array_Ref_T array, size_t index);
+  using iterator_category = std::forward_iterator_tag;
+  using value_type = Value_T;
+  using difference_type = long;
+  using pointer = Object*;
+  using reference = Value_T&;  
+  
+  Iterator(Array_Ref_T array, long index);
 
   template<typename Array_Ref_T_, typename Value_T_>
   Iterator(Iterator<Array_Ref_T_, Value_T_> const & rhs);
@@ -183,11 +183,11 @@ public:
   // friend class Iterator;
 
   Array_Ref_T array() const;
-  size_t index() const;
+  long index() const;
 
 private:
   Array_Ref_T array_;
-  size_t index_;
+  long index_;
 
   Object tmp_;
 };

data/rice/Array.ipp

@@ -32,31 +32,31 @@ Array(Iter_T it, Iter_T end)
   }
 }
 
-template<typename T, size_t n>
+template<typename T, long n>
 inline Rice::Array::
 Array(T const (& a)[n])
   : Builtin_Object<T_ARRAY>(protect(rb_ary_new))
 {
-  for(size_t j = 0; j < n; ++j)
+  for(long j = 0; j < n; ++j)
   {
     push(a[j]);
   }
 }
 
-inline size_t Rice::Array::
+inline long Rice::Array::
 size() const
 {
   return RARRAY_LEN(this->value());
 }
 
 inline Rice::Object Rice::Array::
-operator[](ptrdiff_t index) const
+operator[](long index) const
 {
   return protect(rb_ary_entry, value(), position_of(index));
 }
 
 inline Rice::Array::Proxy Rice::Array::
-operator[](ptrdiff_t index)
+operator[](long index)
 {
   return Proxy(*this, position_of(index));
 }
@@ -87,8 +87,8 @@ shift()
   return protect(rb_ary_shift, value());
 }
 
-inline size_t Rice::Array::
-position_of(ptrdiff_t index) const
+inline long Rice::Array::
+position_of(long index) const
 {
   if(index < 0)
   {
@@ -96,12 +96,12 @@ position_of(ptrdiff_t index) const
   }
   else
   {
-    return static_cast<size_t>(index);
+    return static_cast<long>(index);
   }
 }
 
 inline Rice::Array::Proxy::
-Proxy(Array array, size_t index)
+Proxy(Array array, long index)
   : array_(array)
   , index_(index)
 {
@@ -130,7 +130,7 @@ operator=(T const & value)
 
 template<typename Array_Ref_T, typename Value_T>
 inline Rice::Array::Iterator<Array_Ref_T, Value_T>::
-Iterator(Array_Ref_T array, size_t index)
+Iterator(Array_Ref_T array, long index)
   : array_(array)
   , index_(index)
 {
@@ -221,7 +221,7 @@ array() const
 }
 
 template<typename Array_Ref_T, typename Value_T>
-size_t
+long
 Rice::Array::Iterator<Array_Ref_T, Value_T>::
 index() const
 {

data/rice/Class_defn.hpp

@@ -9,6 +9,7 @@
 
 /*!
  *  \example inheritance/animals.cpp
+ *  \example callbacks/sample_callbacks.cpp
  */
 
 namespace Rice

data/rice/Constructor.hpp

@@ -1,391 +1,47 @@
 #ifndef Rice__Constructor__hpp_
 #define Rice__Constructor__hpp_
 
-// This is a generated file.  DO NOT EDIT!!
-
-
 // This causes problems with certain C++ libraries
 #undef TYPE
 
 #include "to_from_ruby_defn.hpp"
-#include "detail/method_data.hpp"
+
 namespace Rice
 {
-#ifdef DOXYGEN
-//! Define a Type's Constructor and it's arguments.
-/*! E.g. for the default constructor on a Type:
-    \code
-      define_class<Test>()
-        .define_constructor(Constructor<Test>());
-    \endcode
- *
- *  The first template type must be the type being wrapped.
- *  Afterwards any extra types must match the appropriate constructor
- *  to be used in C++ when constructing the object.
- *
- *  For more information, see Rice::Data_Type::define_constructor.
- */
-template<typename T, typename ArgTypes, ...>
-class Constructor
-{
-};
-
-#else
-
-  template<typename T, typename Arg0_T=void, typename Arg1_T=void, typename Arg2_T=void, typename Arg3_T=void, typename Arg4_T=void, typename Arg5_T=void, typename Arg6_T=void, typename Arg7_T=void, typename Arg8_T=void, typename Arg9_T=void, typename Arg10_T=void, typename Arg11_T=void, typename Arg12_T=void, typename Arg13_T=void, typename Arg14_T=void, typename Arg15_T=void>
+  //! Define a Type's Constructor and it's arguments.
+  /*! E.g. for the default constructor on a Type:
+      \code
+        define_class<Test>()
+          .define_constructor(Constructor<Test>());
+      \endcode
+  *
+  *  The first template type must be the type being wrapped.
+  *  Afterwards any extra types must match the appropriate constructor
+  *  to be used in C++ when constructing the object.
+  *
+  *  For more information, see Rice::Data_Type::define_constructor.
+  */
+  template<typename T, typename ...Arg_T>
   class Constructor
   {
-  private:
-    Constructor()
-    {
-    }
-  };
-
-  template<typename T>
-  class Constructor<T, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
-  {
   public:
-    static void construct(Object self)
+    static void construct(Object self, Arg_T... args)
     {
-      DATA_PTR(self.value()) = new T();
+      DATA_PTR(self.value()) = new T(args...);
     }
   };
 
-
-  template<typename T>
-  class Constructor<T, Object, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
+  //! Special-case Constructor used when defining Directors.
+  template<typename T, typename ...Arg_T>
+  class Constructor<T, Object, Arg_T...>
   {
-  public:
-    static void construct(Object self)
-    {
-      DATA_PTR(self.value()) = new T(self);
-    }
+    public:
+      static void construct(Object self, Arg_T... args)
+      {
+        DATA_PTR(self.value()) = new T(self, args...);
+      }
   };
+}
 
-
-    template<typename T, typename Arg0_T>
-    class Constructor<T, Arg0_T, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0)
-        {
-          DATA_PTR(self.value()) = new T(arg0);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T>
-    class Constructor<T, Arg0_T, Arg1_T, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, void, void, void, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, void, void, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, void, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4, arg5);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9, Arg10_T arg10)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9, Arg10_T arg10, Arg11_T arg11)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T, typename Arg12_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, Arg12_T, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9, Arg10_T arg10, Arg11_T arg11, Arg12_T arg12)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T, typename Arg12_T, typename Arg13_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, Arg12_T, Arg13_T, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9, Arg10_T arg10, Arg11_T arg11, Arg12_T arg12, Arg13_T arg13)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T, typename Arg12_T, typename Arg13_T, typename Arg14_T>
-    class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, Arg12_T, Arg13_T, Arg14_T, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9, Arg10_T arg10, Arg11_T arg11, Arg12_T arg12, Arg13_T arg13, Arg14_T arg14)
-        {
-          DATA_PTR(self.value()) = new T(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T>
-    class Constructor<T, Object, Arg0_T, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, void, void, void, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, void, void, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, void, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, void, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3, arg4);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, void, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3, arg4, arg5);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, void, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, void, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, void, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, void, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, void, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9, Arg10_T arg10)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, void, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9, Arg10_T arg10, Arg11_T arg11)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T, typename Arg12_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, Arg12_T, void, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9, Arg10_T arg10, Arg11_T arg11, Arg12_T arg12)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-        }
-    };
-
-
-    template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T, typename Arg12_T, typename Arg13_T>
-    class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, Arg12_T, Arg13_T, void>
-    {
-      public:
-        static void construct(Object self, Arg0_T arg0, Arg1_T arg1, Arg2_T arg2, Arg3_T arg3, Arg4_T arg4, Arg5_T arg5, Arg6_T arg6, Arg7_T arg7, Arg8_T arg8, Arg9_T arg9, Arg10_T arg10, Arg11_T arg11, Arg12_T arg12, Arg13_T arg13)
-        {
-          DATA_PTR(self.value()) = new T(self, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13);
-        }
-    };
-
-
-#endif // DOXYGEN
-
-} // namespace Rice
-
-
-#endif // Rice__Constructor__hpp_
+#endif