[GRASS-SVN] r54327 - grass/branches/releasebranch_6_4/include/iostream
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 17 14:12:10 PST 2012
Author: neteler
Date: 2012-12-17 14:12:10 -0800 (Mon, 17 Dec 2012)
New Revision: 54327
Modified:
grass/branches/releasebranch_6_4/include/iostream/empq_impl.h
Log:
backport of r54320, trac #1765
Modified: grass/branches/releasebranch_6_4/include/iostream/empq_impl.h
===================================================================
--- grass/branches/releasebranch_6_4/include/iostream/empq_impl.h 2012-12-17 22:03:30 UTC (rev 54326)
+++ grass/branches/releasebranch_6_4/include/iostream/empq_impl.h 2012-12-17 22:12:10 UTC (rev 54327)
@@ -1,10 +1,25 @@
-
/****************************************************************************
*
* MODULE: iostream
*
* COPYRIGHT (C) 2007 Laura Toma
*
+ *
+
+ * Iostream is a library that implements streams, external memory
+ * sorting on streams, and an external memory priority queue on
+ * streams. These are the fundamental components used in external
+ * memory algorithms.
+
+ * Credits: The library was developed by Laura Toma. The kernel of
+ * class STREAM is based on the similar class existent in the GPL TPIE
+ * project developed at Duke University. The sorting and priority
+ * queue have been developed by Laura Toma based on communications
+ * with Rajiv Wickremesinghe. The library was developed as part of
+ * porting Terraflow to GRASS in 2001. PEARL upgrades in 2003 by
+ * Rajiv Wickremesinghe as part of the Terracost project.
+
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -1357,7 +1372,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;
More information about the grass-commit
mailing list