HPCC-22968 Make it compile on OSX

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

common/thorhelper/thorcommon.hpp

@@ -151,7 +151,8 @@ interface IExtRowStream: extends IRowStream
     virtual offset_t getOffset() const = 0;
     virtual offset_t getLastRowOffset() const = 0;
     virtual unsigned __int64 queryProgress() const = 0;
-    virtual void stop(CRC32 *crcout=NULL) = 0;
+    using IRowStream::stop;
+    virtual void stop(CRC32 *crcout) = 0;
     virtual const byte *prefetchRow() = 0;
     virtual void prefetchDone() = 0;
     virtual void reinit(offset_t offset,offset_t len,unsigned __int64 maxrows) = 0;
@@ -162,7 +163,8 @@ interface IExtRowStream: extends IRowStream
 interface IExtRowWriter: extends IRowWriter
 {
     virtual offset_t getPosition() = 0;
-    virtual void flush(CRC32 *crcout=NULL) = 0;
+    using IRowWriter::flush;
+    virtual void flush(CRC32 *crcout) = 0;
 };
 
 enum EmptyRowSemantics { ers_forbidden, ers_allow, ers_eogonly };

ecl/hql/hqlexpr.cpp

@@ -3596,7 +3596,7 @@ IIdAtom * CHqlExpression::queryId() const
 }
 
 //Can be called from updateFlagsAfterOperands to help track down inconsistencies
-static bool verifyTransform(IHqlExpression * record, IHqlExpression * expr)
+bool verifyTransform(IHqlExpression * record, IHqlExpression * expr)
 {
     ForEachChild(i, expr)
     {
@@ -6385,23 +6385,6 @@ IHqlDataset *CHqlRow::queryDataset()
 
 //==============================================================================================================
 
-static bool isMany(IHqlExpression * expr)
-{
-    switch (expr->getOperator())
-    {
-    case no_attr:
-    case no_attr_expr:
-    case no_attr_link:
-        return (expr->queryName() == manyAtom);
-    case no_range:
-        return isMany(expr->queryChild(1));
-    case no_constant:
-        return (expr->queryValue()->getIntValue() > 1);
-    default:
-        UNIMPLEMENTED;
-    }
-}
-
 // Is this numeric expression evaluated to zero?
 bool isZero(IHqlExpression * expr)
 {
@@ -14803,7 +14786,9 @@ public:
     }
 };
 
-static bool removeVirtualAttributes(HqlExprArray & fields, IHqlExpression * cur, HqlMapTransformer & transformer)
+// MORE - does not seem to be called?
+
+bool removeVirtualAttributes(HqlExprArray & fields, IHqlExpression * cur, HqlMapTransformer & transformer)
 {
     switch (cur->getOperator())
     {

ecl/hql/hqlexpr.ipp

@@ -1163,6 +1163,7 @@ public:
     virtual int getPropInt(IAtom * a, int def) const override { return def; }
     virtual bool getProp(IAtom * a, StringBuffer &ret) const override { return false; }
 
+    using CHqlDelayedCall::clone;
     virtual IHqlScope * clone(HqlExprArray & children, HqlExprArray & symbols) override { throwUnexpected(); }
 
     virtual IHqlScope * queryConcreteScope() override;

ecl/hql/hqlgram2.cpp

@@ -3169,6 +3169,7 @@ IHqlExpression * HqlGram::leaveLamdaExpression(attribute * paramattr, attribute
 #endif
 class PseudoPatternScope : public CHqlScope
 {
+    using CHqlScope::defineSymbol;
 public:
     PseudoPatternScope(IHqlExpression * _patternList);
 
@@ -3189,8 +3190,8 @@ public:
 
     virtual bool isImplicit() const { return false; }
     virtual bool isPlugin() const { return false; }
-    virtual int getPropInt(IIdAtom *, int dft) const { PSEUDO_UNIMPLEMENTED; return dft; }
-    virtual bool getProp(IIdAtom *, StringBuffer &) const { PSEUDO_UNIMPLEMENTED; return false; }
+    virtual int getPropInt(IAtom *, int dft) const { PSEUDO_UNIMPLEMENTED; return dft; }
+    virtual bool getProp(IAtom *, StringBuffer &) const { PSEUDO_UNIMPLEMENTED; return false; }
 
     virtual IHqlScope * clone(HqlExprArray & children, HqlExprArray & symbols) { throwUnexpected(); }
     virtual IHqlScope * queryConcreteScope() { return this; }

ecl/hql/hqltrans.ipp

@@ -820,9 +820,11 @@ public:
     inline AMergingTransformInfo(IHqlExpression * _expr) : NewTransformInfo(_expr) {}
 
     virtual IHqlExpression * queryAlreadyTransformed(IHqlExpression * childScope) = 0;
+    using NewTransformInfo::setTransformed;
     virtual void setTransformed(IHqlExpression * childScope, IHqlExpression * value) = 0;
 
     virtual IHqlExpression * queryAlreadyTransformedSelector(IHqlExpression * childScope) = 0;
+    using NewTransformInfo::setTransformedSelector;
     virtual void setTransformedSelector(IHqlExpression * childScope, IHqlExpression * value) = 0;
 
     inline bool recurseParentScopes()
@@ -961,6 +963,10 @@ public:
 
 class HQL_API NewSelectorReplacingInfo : public NewTransformInfo
 {
+    using NewTransformInfo::queryTransformed;
+    using NewTransformInfo::queryTransformedSelector;
+    using NewTransformInfo::setTransformed;
+    using NewTransformInfo::setTransformedSelector;
 public:
     NewSelectorReplacingInfo(IHqlExpression * _original) : NewTransformInfo(_original) {}
 

ecl/hqlcpp/hqlcset.ipp

@@ -45,6 +45,7 @@ protected:
 
 class BlockDatasetCursor : public BaseDatasetCursor
 {
+    using BaseDatasetCursor::buildIterateClass;
 public:
     BlockDatasetCursor(HqlCppTranslator & _translator, IHqlExpression * _ds, CHqlBoundExpr & _boundDs);
 
@@ -69,6 +70,7 @@ protected:
 
 class InlineLinkedDatasetCursor : public BaseDatasetCursor
 {
+    using BaseDatasetCursor::buildIterateClass;
 public:
     InlineLinkedDatasetCursor(HqlCppTranslator & _translator, IHqlExpression * _ds, CHqlBoundExpr & _boundDs);
 
@@ -84,6 +86,7 @@ protected:
 
 class StreamedDatasetCursor : public BaseDatasetCursor
 {
+    using BaseDatasetCursor::buildIterateClass;
 public:
     StreamedDatasetCursor(HqlCppTranslator & _translator, IHqlExpression * _ds, CHqlBoundExpr & _boundDs);
 
@@ -115,6 +118,7 @@ private:
 
 class MultiLevelDatasetCursor : public BaseDatasetCursor
 {
+    using BaseDatasetCursor::buildIterateClass;
 public:
     MultiLevelDatasetCursor(HqlCppTranslator & _translator, IHqlExpression * _ds);
 

ecl/hqlcpp/hqltcppc.ipp

@@ -605,6 +605,7 @@ protected:
 
 class HQLCPP_API DynamicColumnToOffsetMap : public ColumnToOffsetMap
 {
+    using ColumnToOffsetMap::addColumn;
 public:
     DynamicColumnToOffsetMap(unsigned _maxRecordSize);
 

ecl/hqlcpp/hqlttcpp.cpp

@@ -11165,7 +11165,7 @@ void LeftRightTransformer::process(HqlExprArray & exprs)
 
 
   */
-static void unwindAnnotations(HqlExprCopyArray & unwound, IHqlExpression * expr)
+void unwindAnnotations(HqlExprCopyArray & unwound, IHqlExpression * expr)
 {
     if (expr->getAnnotationKind() == annotate_none)
         return;

ecl/hthor/hthor.cpp

@@ -425,7 +425,7 @@ void CHThorDiskWriteActivity::execute()
 
 void CHThorDiskWriteActivity::stop()
 {
-    outSeq->flush();
+    outSeq->flush(NULL);
     if(blockcompressed)
         uncompressedBytesWritten = outSeq->getPosition();
     updateWorkUnitResult(numRecords);

rtl/include/eclhelper.hpp

@@ -2620,6 +2620,7 @@ struct IHThorRemoteArg : public IHThorArg
 struct IHThorLibraryCallArg : public IHThorArg
 {
     virtual void createParentExtract(rtlRowBuilder & builder) = 0;
+    using IHThorArg::queryOutputMeta;
     virtual IOutputMetaData * queryOutputMeta(unsigned whichOutput) = 0;
     virtual char * getLibraryName() = 0;
 };

rtl/include/eclhelper_base.hpp

@@ -49,6 +49,13 @@ public:
     virtual IOutputMetaData * queryOutputMeta() override { return NULL; }
 };
 
+class ECLRTL_API CThorSinkLibraryArg : public CThorArgOf<IHThorLibraryCallArg>
+{
+public:
+    virtual IOutputMetaData * queryOutputMeta() override { return NULL; }
+    virtual IOutputMetaData * queryOutputMeta(unsigned whichOutput) override { return NULL; }
+};
+
 class ECLRTL_API CThorIndexWriteArg : public CThorSinkArgOf<IHThorIndexWriteArg>
 {
 public:
@@ -1213,7 +1220,7 @@ class ECLRTL_API CThorRemoteArg : public CThorArgOf<IHThorRemoteArg>
     virtual void onLimitExceeded() override;
 };
 
-class ECLRTL_API CThorLibraryCallArg : public CThorSinkArgOf<IHThorLibraryCallArg>
+class ECLRTL_API CThorLibraryCallArg : public CThorSinkLibraryArg
 {
 };
 

thorlcr/thorutil/thmem.cpp

@@ -1417,7 +1417,7 @@ rowidx_t CThorSpillableRowArray::save(IFile &iFile, unsigned _spillCompInfo, boo
             const void *row = rows[i];
             if (i == nextCBI)
             {
-                writer->flush();
+                writer->flush(NULL);
                 do
                 {
                     nextCB->filePosition(writer->getPosition());
@@ -1444,7 +1444,7 @@ rowidx_t CThorSpillableRowArray::save(IFile &iFile, unsigned _spillCompInfo, boo
             }
             ++i;
         }
-        writer->flush();
+        writer->flush(NULL);
     }
     catch (IException *e)
     {

thorlcr/thorutil/thormisc.hpp

@@ -295,11 +295,11 @@ public:
     }
 // IExtRowStream
     virtual const void *nextRow() override { return stream->nextRow(); }
-    virtual void stop() override { stream->stop(); }
+    virtual void stop() override { stream->stop(NULL); }
     virtual offset_t getOffset() const override { return stream->getOffset(); }
     virtual offset_t getLastRowOffset() const override { return stream->getLastRowOffset(); }
     virtual unsigned __int64 queryProgress() const override { return stream->queryProgress(); }
-    virtual void stop(CRC32 *crcout=NULL) override { stream->stop(); }
+    virtual void stop(CRC32 *crcout) override { stream->stop(crcout); }
     virtual const byte *prefetchRow() override { return stream->prefetchRow(); }
     virtual void prefetchDone() override { stream->prefetchDone(); }
     virtual void reinit(offset_t offset, offset_t len, unsigned __int64 maxRows) override