[GRASS-SVN] r54320 - grass/trunk/include/iostream

[svn_grass at osgeo.org]

Author: glynn
Date: 2012-12-16 16:46:37 -0800 (Sun, 16 Dec 2012)
New Revision: 54320

Modified:
   grass/trunk/include/iostream/empq_impl.h
Log:
Replace VLA with std::vector


Modified: grass/trunk/include/iostream/empq_impl.h
===================================================================
--- grass/trunk/include/iostream/empq_impl.h	2012-12-16 23:16:46 UTC (rev 54319)
+++ grass/trunk/include/iostream/empq_impl.h	2012-12-17 00:46:37 UTC (rev 54320)
@@ -38,6 +38,7 @@
 #define __EMPQ_IMPL_H
 
 #include <ostream>
+#include <vector>
 using namespace std;
 
 #include "empq.h"
@@ -1374,7 +1375,7 @@
   assert(arity> 1);
     
   //Pointers to current leading elements of streams
-  ExtendedEltMergeType<T,Key> in_objects[arity];
+  std::vector<ExtendedEltMergeType<T,Key> > in_objects(arity);
 
   AMI_err ami_err;
   //unsigned int i;