From 4f2dcfaeeb32b22af3424c5b7a4cd2847b7875f5 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 15 Dec 2015 14:22:05 +0000
Subject: [PATCH] Fixes for Ruby and using -Wmissing-field-initializers

---
 Lib/ruby/boost_shared_ptr.i | 24 ++++++++++++------------
 Lib/ruby/director.swg       |  4 ++--
 Lib/ruby/rubyrun.swg        |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Lib/ruby/boost_shared_ptr.i b/Lib/ruby/boost_shared_ptr.i
index a58f0f828..938074d81 100644
--- a/Lib/ruby/boost_shared_ptr.i
+++ b/Lib/ruby/boost_shared_ptr.i
@@ -26,7 +26,7 @@
 
 // plain value
 %typemap(in) CONST TYPE (void *argp, int res = 0) {
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %argument_fail(res, "$type", $symname, $argnum);
@@ -45,7 +45,7 @@
 
 %typemap(varin) CONST TYPE {
   void *argp = 0;
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %variable_fail(res, "$type", "$name");
@@ -65,7 +65,7 @@
 // plain pointer
 // Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
 %typemap(in) CONST TYPE * (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) {
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %argument_fail(res, "$type", $symname, $argnum);
@@ -87,7 +87,7 @@
 
 %typemap(varin) CONST TYPE * {
   void *argp = 0;
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %variable_fail(res, "$type", "$name");
@@ -110,7 +110,7 @@
 
 // plain reference
 %typemap(in) CONST TYPE & (void  *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %argument_fail(res, "$type", $symname, $argnum);
@@ -131,7 +131,7 @@
 
 %typemap(varin) CONST TYPE & {
   void *argp = 0;
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %variable_fail(res, "$type", "$name");
@@ -156,7 +156,7 @@
 // plain pointer by reference
 // Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
 %typemap(in) TYPE *CONST& (void  *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %argument_fail(res, "$type", $symname, $argnum);
@@ -184,7 +184,7 @@
 
 // shared_ptr by value
 %typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void *argp, int res = 0) {
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %argument_fail(res, "$type", $symname, $argnum);
@@ -198,7 +198,7 @@
 }
 
 %typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   void *argp = 0;
   int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
@@ -214,7 +214,7 @@
 
 // shared_ptr by reference
 %typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & (void *argp, int res = 0, $*1_ltype tempshared) {
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %argument_fail(res, "$type", $symname, $argnum);
@@ -241,7 +241,7 @@
 
 // shared_ptr by pointer
 %typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * (void *argp, int res = 0, $*1_ltype tempshared) {
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %argument_fail(res, "$type", $symname, $argnum);
@@ -269,7 +269,7 @@
 
 // shared_ptr by pointer reference
 %typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (void *argp, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, $*1_ltype temp = 0) {
-  swig_ruby_owntype newmem = {0};
+  swig_ruby_owntype newmem = {0, 0};
   res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
   if (!SWIG_IsOK(res)) {
     %argument_fail(res, "$type", $symname, $argnum);
diff --git a/Lib/ruby/director.swg b/Lib/ruby/director.swg
index 5d5161db4..c6c53a343 100644
--- a/Lib/ruby/director.swg
+++ b/Lib/ruby/director.swg
@@ -30,7 +30,7 @@ namespace Swig {
     }
 
     virtual swig_ruby_owntype get_own() const {
-      swig_ruby_owntype own = {0};
+      swig_ruby_owntype own = {0, 0};
       return own;
     }
   };
@@ -332,7 +332,7 @@ namespace Swig {
     }
 
     swig_ruby_owntype swig_release_ownership(void *vptr) const {
-      swig_ruby_owntype own = {0};
+      swig_ruby_owntype own = {0, 0};
       if (vptr) {
 	SWIG_GUARD(swig_mutex_own);
 	swig_ownership_map::iterator iter = swig_owner.find(vptr);
diff --git a/Lib/ruby/rubyrun.swg b/Lib/ruby/rubyrun.swg
index 615d8ad38..e18208f90 100644
--- a/Lib/ruby/rubyrun.swg
+++ b/Lib/ruby/rubyrun.swg
@@ -245,7 +245,7 @@ typedef struct {
 
 SWIGRUNTIME swig_ruby_owntype
 SWIG_Ruby_AcquirePtr(VALUE obj, swig_ruby_owntype own) {
-  swig_ruby_owntype oldown = {0};
+  swig_ruby_owntype oldown = {0, 0};
   if (obj) {
     oldown.datafree = RDATA(obj)->dfree;
     RDATA(obj)->dfree = own.datafree;