[pktools] 310/375: Fix build failure on ARM due to va_list usage in myfann_cpp.h

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch upstream-master
in repository pktools.

commit 296a297b25f3553fd8657f729b858e90b99dca4c
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Wed Aug 13 22:17:09 2014 +0200

    Fix build failure on ARM due to va_list usage in myfann_cpp.h
---
 ChangeLog                   |  3 ++-
 src/algorithms/myfann_cpp.h | 30 ++++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e0a265c..dfea511 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -301,7 +301,8 @@ version 2.5.2
 version 2.5.3
  - pklas2img
 	libLAS 1.8.0 support (ticket #42951)
-
+ - myfann_cpp.h 
+	Fix build failure on ARM due to va_list usage in myfann_cpp.h
 Next versions: 
  - todo for API: ImgReaderGdal (ImgWriterGdal) open in update mode (check gdal_edit.py: http://searchcode.com/codesearch/view/18938404)
 
diff --git a/src/algorithms/myfann_cpp.h b/src/algorithms/myfann_cpp.h
index 7938379..29e8997 100644
--- a/src/algorithms/myfann_cpp.h
+++ b/src/algorithms/myfann_cpp.h
@@ -1061,9 +1061,14 @@ 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));
+            /* 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;
         }
@@ -1111,9 +1116,16 @@ 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));
+            /* 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;
         }
@@ -1158,9 +1170,15 @@ 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));
+            /* 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/pkg-grass/pktools.git