[libfann] 16/34: Update patch Portable-handling-for-va_list.patch

[Christian Kastner]

This is an automated email from the git hooks/post-receive script.

chrisk-guest pushed a commit to branch master
in repository libfann.

commit 55f1b37ac43336e7641f1c7f32e5cff8094d40be
Author: Christian Kastner <ckk at kvr.at>
Date:   Thu Oct 1 11:31:59 2015 +0200

    Update patch Portable-handling-for-va_list.patch
---
 debian/patches/Portable-handling-for-va_list.patch | 103 ++++++++++-----------
 1 file changed, 51 insertions(+), 52 deletions(-)

diff --git a/debian/patches/Portable-handling-for-va_list.patch b/debian/patches/Portable-handling-for-va_list.patch
index 23d130f..5bfb424 100644
--- a/debian/patches/Portable-handling-for-va_list.patch
+++ b/debian/patches/Portable-handling-for-va_list.patch
@@ -1,6 +1,6 @@
-From: Christian Kastner <debian at kvr.at>
+From: Christian Kastner <ckk at debian.org>
 Date: Thu, 1 Jul 2010 01:02:47 +0200
-Subject: [PATCH] Portable handling for va_list
+Subject: Portable handling for va_list
 
 The current code wrongly assumes va_list is always implemented as an array. va_list
 however is an opaque type, and may also be implemented as a struct, for
@@ -8,58 +8,57 @@ example. This patch implements handling of va_list in a platform-independent
 way, fixing a FTBFS on alpha and armel.
 
 Forwarded: no
-Last-Update: 2010-07-01
+Last-Update: 2015-09-25
 ---
- src/include/fann_cpp.h |   21 +++++++++++++++------
- 1 files changed, 15 insertions(+), 6 deletions(-)
+ src/include/fann_cpp.h | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
 
 diff --git a/src/include/fann_cpp.h b/src/include/fann_cpp.h
-index eb647af..bf6e75b 100644
+index c28caac..643e1a3 100644
 --- a/src/include/fann_cpp.h
 +++ b/src/include/fann_cpp.h
-@@ -916,9 +916,12 @@ public:
-         bool create_standard(unsigned int num_layers, ...)
-         {
-             va_list layers;
-+            unsigned int arr[num_layers];
-+
-             va_start(layers, num_layers);
--            bool status = create_standard_array(num_layers,
--                reinterpret_cast<const unsigned int *>(layers));
-+            for (unsigned int ii = 0; ii < num_layers; ii++)
-+                arr[ii] = va_arg(layers, unsigned int);
-+            bool status = create_standard_array(num_layers, arr);
-             va_end(layers);
-             return status;
-         }
-@@ -966,9 +969,12 @@ public:
-         bool create_sparse(float connection_rate, unsigned int num_layers, ...)
-         {
-             va_list layers;
-+            unsigned int arr[num_layers];
-+
-             va_start(layers, num_layers);
--            bool status = create_sparse_array(connection_rate, num_layers,
--                reinterpret_cast<const unsigned int *>(layers));
-+            for (unsigned int ii = 0; ii < num_layers; ii++)
-+                arr[ii] = va_arg(layers, unsigned int);
-+            bool status = create_sparse_array(connection_rate, num_layers, arr);
-             va_end(layers);
-             return status;
-         }
-@@ -1013,9 +1019,12 @@ public:
-         bool create_shortcut(unsigned int num_layers, ...)
-         {
-             va_list layers;
-+            unsigned int arr[num_layers];
-+
-             va_start(layers, num_layers);
--            bool status = create_shortcut_array(num_layers,
--                reinterpret_cast<const unsigned int *>(layers));
-+            for (unsigned int ii = 0; ii < num_layers; ii++)
-+                arr[ii] = va_arg(layers, unsigned int);
-+            bool status = create_shortcut_array(num_layers, arr);
-             va_end(layers);
-             return status;
-         }
--- 
+@@ -955,9 +955,12 @@ public:
+         bool create_standard(unsigned int num_layers, ...)
+         {
+             va_list layers;
++            unsigned int arr[num_layers];
++
+             va_start(layers, num_layers);
+-            bool status = create_standard_array(num_layers,
+-                reinterpret_cast<const unsigned int *>(layers));
++            for (unsigned int ii = 0; ii < num_layers; ii++)
++                arr[ii] = va_arg(layers, unsigned int);
++            bool status = create_standard_array(num_layers, arr);
+             va_end(layers);
+             return status;
+         }
+@@ -1005,9 +1008,12 @@ public:
+         bool create_sparse(float connection_rate, unsigned int num_layers, ...)
+         {
+             va_list layers;
++            unsigned int arr[num_layers];
++
+             va_start(layers, num_layers);
+-            bool status = create_sparse_array(connection_rate, num_layers,
+-                reinterpret_cast<const unsigned int *>(layers));
++            for (unsigned int ii = 0; ii < num_layers; ii++)
++                arr[ii] = va_arg(layers, unsigned int);
++            bool status = create_sparse_array(connection_rate, num_layers, arr);
+             va_end(layers);
+             return status;
+         }
+@@ -1052,9 +1058,12 @@ public:
+         bool create_shortcut(unsigned int num_layers, ...)
+         {
+             va_list layers;
++            unsigned int arr[num_layers];
++
+             va_start(layers, num_layers);
+-            bool status = create_shortcut_array(num_layers,
+-                reinterpret_cast<const unsigned int *>(layers));
++            for (unsigned int ii = 0; ii < num_layers; ii++)
++                arr[ii] = va_arg(layers, unsigned int);
++            bool status = create_shortcut_array(num_layers, arr);
+             va_end(layers);
+             return status;
+         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git