rice 4.6.1 → 4.7.0

data/rice/detail/to_ruby.ipp

@@ -42,32 +42,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<bool*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(bool* data)
-      {
-        Buffer<bool> buffer(data);
-        Data_Object<Buffer<bool>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const bool* data)
-      {
-        return this->convert((bool*)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<bool N>
     class To_Ruby<bool[N]>
     {
@@ -144,32 +118,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<int*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(int* data)
-      {
-        Buffer<int> buffer(data);
-        Data_Object<Buffer<int>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const int* data)
-      {
-        return this->convert((int*)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<int[N]>
     {
@@ -190,32 +138,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<int**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(int** data)
-      {
-        Buffer<int*> buffer(data);
-        Data_Object<Buffer<int*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const int** data)
-      {
-        return this->convert((int**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  unsigned int  ============
     template<>
     class To_Ruby<unsigned int>
@@ -263,32 +185,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<unsigned int*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(unsigned int* data)
-      {
-        Buffer<unsigned int> buffer(data);
-        Data_Object<Buffer<unsigned int>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const unsigned int* data)
-      {
-        return this->convert((unsigned int*)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<unsigned int[N]>
     {
@@ -309,32 +205,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<unsigned int**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(unsigned int** data)
-      {
-        Buffer<unsigned int*> buffer(data);
-        Data_Object<Buffer<unsigned int*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const unsigned int** data)
-      {
-        return this->convert((unsigned int**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  char  ============
     template<>
     class To_Ruby<char>
@@ -452,32 +322,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<char**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(char** data)
-      {
-        Buffer<char*> buffer(data);
-        Data_Object<Buffer<char*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const char** data)
-      {
-        return this->convert((char**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  unsigned char  ============
     template<>
     class To_Ruby<unsigned char>
@@ -517,8 +361,8 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<unsigned char*>
+    template<int N>
+    class To_Ruby<unsigned char[N]>
     {
     public:
       To_Ruby() = default;
@@ -527,26 +371,6 @@ namespace Rice
       {
       }
 
-      VALUE convert(unsigned char* data)
-      {
-        Buffer<unsigned char> buffer(data);
-        Data_Object<Buffer<unsigned char>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const unsigned char* data)
-      {
-        return this->convert((unsigned char*)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
-    template<int N>
-    class To_Ruby<unsigned char[N]>
-    {
-    public:
       VALUE convert(unsigned char data[N])
       {
         Buffer<unsigned char> buffer(data, N);
@@ -557,32 +381,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<unsigned char**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(unsigned char** data)
-      {
-        Buffer<unsigned char*> buffer(data);
-        Data_Object<Buffer<unsigned char*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const unsigned char** data)
-      {
-        return this->convert((unsigned char**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  signed char  ============
     template<>
     class To_Ruby<signed char>
@@ -622,32 +420,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<signed char*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(signed char* data)
-      {
-        Buffer<signed char> buffer(data);
-        Data_Object<Buffer<signed char>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const signed char* data)
-      {
-        return this->convert((signed char*)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<signed char[N]>
     {
@@ -668,32 +440,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<signed char**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(signed char** data)
-      {
-        Buffer<signed char*> buffer(data);
-        Data_Object<Buffer<signed char*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const signed char** data)
-      {
-        return this->convert((signed char**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  double  ============
     template<>
     class To_Ruby<double>
@@ -733,27 +479,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<double*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(double* data)
-      {
-        Buffer<double> buffer(data);
-        Data_Object<Buffer<double>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<double[N]>
     {
@@ -774,32 +499,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<double**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(double** data)
-      {
-        Buffer<double*> buffer(data);
-        Data_Object<Buffer<double*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const double** data)
-      {
-        return this->convert((double**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  float  ============
     template<>
     class To_Ruby<float>
@@ -839,27 +538,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<float*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(float* data)
-      {
-        Buffer<float> buffer(data);
-        Data_Object<Buffer<float>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<float[N]>
     {
@@ -880,32 +558,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<float**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(float** data)
-      {
-        Buffer<float*> buffer(data);
-        Data_Object<Buffer<float*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const float** data)
-      {
-        return this->convert((float**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  long  ============
     template<>
     class To_Ruby<long>
@@ -945,27 +597,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<long*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(long* data)
-      {
-        Buffer<long> buffer(data);
-        Data_Object<Buffer<long>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<long[N]>
     {
@@ -986,32 +617,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<long**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(long** data)
-      {
-        Buffer<long*> buffer(data);
-        Data_Object<Buffer<long*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const long** data)
-      {
-        return this->convert((long**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  unsigned long  ============
     template<>
     class To_Ruby<unsigned long>
@@ -1065,27 +670,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<unsigned long*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(unsigned long* data)
-      {
-        Buffer<unsigned long> buffer(data);
-        Data_Object<Buffer<unsigned long>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<unsigned long[N]>
     {
@@ -1106,32 +690,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<unsigned long**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(unsigned long** data)
-      {
-        Buffer<unsigned long*> buffer(data);
-        Data_Object<Buffer<unsigned long*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const unsigned long** data)
-      {
-        return this->convert((unsigned long**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  long long  ============
     template<>
     class To_Ruby<long long>
@@ -1171,27 +729,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<long long*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(long long* data)
-      {
-        Buffer<long long> buffer(data);
-        Data_Object<Buffer<long long>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<long long[N]>
     {
@@ -1212,32 +749,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<long long**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(long long** data)
-      {
-        Buffer<long long*> buffer(data);
-        Data_Object<Buffer<long long*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const long long** data)
-      {
-        return this->convert((long long**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  unsigned long long  ============
     template<>
     class To_Ruby<unsigned long long>
@@ -1302,27 +813,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<unsigned long long*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(unsigned long long* data)
-      {
-        Buffer<unsigned long long> buffer(data);
-        Data_Object<Buffer<unsigned long long>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<unsigned long long[N]>
     {
@@ -1343,32 +833,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<unsigned long long**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(unsigned long long** data)
-      {
-        Buffer<unsigned long long*> buffer(data);
-        Data_Object<Buffer<unsigned long long*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const unsigned long long** data)
-      {
-        return this->convert((unsigned long long**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  short  ============
     template<>
     class To_Ruby<short>
@@ -1416,27 +880,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<short*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(short* data)
-      {
-        Buffer<short> buffer(data);
-        Data_Object<Buffer<short>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<short[N]>
     {
@@ -1457,32 +900,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<short**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(short** data)
-      {
-        Buffer<short*> buffer(data);
-        Data_Object<Buffer<short*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const short** data)
-      {
-        return this->convert((short**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  unsigned short  ============
     template<>
     class To_Ruby<unsigned short>
@@ -1530,27 +947,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<unsigned short*>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(unsigned short* data)
-      {
-        Buffer<unsigned short> buffer(data);
-        Data_Object<Buffer<unsigned short>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     template<int N>
     class To_Ruby<unsigned short[N]>
     {
@@ -1571,32 +967,6 @@ namespace Rice
       Arg* arg_ = nullptr;
     };
 
-    template<>
-    class To_Ruby<unsigned short**>
-    {
-    public:
-      To_Ruby() = default;
-
-      explicit To_Ruby(Arg* arg) : arg_(arg)
-      {
-      }
-
-      VALUE convert(unsigned short** data)
-      {
-        Buffer<unsigned short*> buffer(data);
-        Data_Object<Buffer<unsigned short*>> dataObject(std::move(buffer));
-        return dataObject.value();
-      }
-
-      VALUE convert(const unsigned short** data)
-      {
-        return this->convert((unsigned short**)data);
-      }
-
-    private:
-      Arg* arg_ = nullptr;
-    };
-
     // ===========  std::nullptr_t  ============
     template<>
     class To_Ruby<std::nullptr_t>
@@ -1660,9 +1030,8 @@ namespace Rice
         }
         else
         {
-          Buffer<void> buffer(data);
-          Data_Object<Buffer<void>> dataObject(std::move(buffer));
-          return dataObject.value();
+          bool isOwner = this->arg_ && this->arg_->isOwner();
+          return detail::wrap(Data_Type<Pointer<void>>::klass(), Data_Type<Pointer<void>>::ruby_data_type(), data, isOwner);
         }
       }