HPCC-12840 Change reference parameter passed to va_start to a pointer

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

roxie/ccd/ccdserver.cpp

@@ -380,21 +380,21 @@ protected:
 
 static const StatisticsMapping actStatistics(StWhenFirstRow, StTimeElapsed, StTimeLocalExecute, StTimeTotalExecute, StSizeMaxRowSize,
                                               StNumRowsProcessed, StNumSlaves, StNumStarted, StNumStopped, StKindNone);
-static const StatisticsMapping joinStatistics(actStatistics, StNumAtmostTriggered, StKindNone);
-static const StatisticsMapping keyedJoinStatistics(joinStatistics, StNumServerCacheHits, StNumIndexSeeks, StNumIndexScans, StNumIndexWildSeeks,
+static const StatisticsMapping joinStatistics(&actStatistics, StNumAtmostTriggered, StKindNone);
+static const StatisticsMapping keyedJoinStatistics(&joinStatistics, StNumServerCacheHits, StNumIndexSeeks, StNumIndexScans, StNumIndexWildSeeks,
                                                     StNumIndexSkips, StNumIndexNullSkips, StNumIndexMerges, StNumIndexMergeCompares,
                                                     StNumPreFiltered, StNumPostFiltered, StNumIndexAccepted, StNumIndexRejected,
                                                     StNumIndexRowsRead, StNumDiskRowsRead, StNumDiskSeeks, StNumDiskAccepted,
                                                     StNumBlobCacheHits, StNumLeafCacheHits, StNumNodeCacheHits,
                                                     StNumBlobCacheAdds, StNumLeafCacheAdds, StNumNodeCacheAdds,
                                                     StNumDiskRejected, StKindNone);
-static const StatisticsMapping indexStatistics(actStatistics, StNumServerCacheHits, StNumIndexSeeks, StNumIndexScans, StNumIndexWildSeeks,
+static const StatisticsMapping indexStatistics(&actStatistics, StNumServerCacheHits, StNumIndexSeeks, StNumIndexScans, StNumIndexWildSeeks,
                                                 StNumIndexSkips, StNumIndexNullSkips, StNumIndexMerges, StNumIndexMergeCompares,
                                                 StNumPreFiltered, StNumPostFiltered, StNumIndexAccepted, StNumIndexRejected,
                                                 StNumBlobCacheHits, StNumLeafCacheHits, StNumNodeCacheHits,
                                                 StNumBlobCacheAdds, StNumLeafCacheAdds, StNumNodeCacheAdds,
                                                 StNumIndexRowsRead, StKindNone);
-static const StatisticsMapping diskStatistics(actStatistics, StNumServerCacheHits, StNumDiskRowsRead, StNumDiskSeeks, StNumDiskAccepted,
+static const StatisticsMapping diskStatistics(&actStatistics, StNumServerCacheHits, StNumDiskRowsRead, StNumDiskSeeks, StNumDiskAccepted,
                                                StNumDiskRejected, StKindNone);
 
 //=================================================================================

system/jlib/jstats.cpp

@@ -699,10 +699,10 @@ StatisticsMapping::StatisticsMapping(StatisticKind kind, ...)
     createMappings();
 }
 
-StatisticsMapping::StatisticsMapping(const StatisticsMapping &from, ...)
+StatisticsMapping::StatisticsMapping(const StatisticsMapping * from, ...)
 {
-    ForEachItemIn(idx, from.indexToKind)
-        indexToKind.append(from.indexToKind.item(idx));
+    ForEachItemIn(idx, from->indexToKind)
+        indexToKind.append(from->indexToKind.item(idx));
     va_list args;
     va_start(args, from);
     for (;;)
@@ -732,10 +732,10 @@ void StatisticsMapping::createMappings()
     for (unsigned i=0; i < StMax; i++)
         kindToIndex.append(numStatistics());
 
-    ForEachItemIn(i, indexToKind)
+    ForEachItemIn(i2, indexToKind)
     {
-        unsigned kind = indexToKind.item(i);
-        kindToIndex.replace(i, kind);
+        unsigned kind = indexToKind.item(i2);
+        kindToIndex.replace(i2, kind);
     }
 }
 

system/jlib/jstats.h

@@ -408,7 +408,7 @@ public:
     //Takes a list of StatisticKind terminated by StKindNone
     StatisticsMapping(StatisticKind kind, ...);
     //Takes an existing Mapping, and extends it with a list of StatisticKind terminated by StKindNone
-    StatisticsMapping(const StatisticsMapping &, ...);
+    StatisticsMapping(const StatisticsMapping * from, ...);
     //Accepts all StatisticKind values
     StatisticsMapping();