Resolve rebasing merge conflicts

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

ecl/hql/hqlpmap.cpp

@@ -160,7 +160,6 @@ void replaceSelectors(HqlExprArray & out, IHqlExpression * expr, unsigned first,
 
 //---------------------------------------------------------------------------------------------------------------------
 
-#if 0000
 void replaceSelectors(HqlExprArray & exprs, unsigned first, IHqlExpression * oldDataset, IHqlExpression * newDataset)
 {
     unsigned max = exprs.ordinality();
@@ -182,8 +181,6 @@ void replaceSelectors(HqlExprArray & exprs, unsigned first, IHqlExpression * old
 }
 
 
-#endif
-
 //NB: This can not be derived from NewHqlTransformer since it is called before the tree is normalised, and it creates
 //inconsistent expression trees.
 class HqlSelfRefTransformer

ecl/hql/hqlpmap.hpp

@@ -172,7 +172,7 @@ extern HQL_API IHqlExpression * replaceSelector(IHqlExpression * expr, IHqlExpre
 extern HQL_API void replaceSelectors(HqlExprArray & out, IHqlExpression * expr, unsigned first, IHqlExpression * oldDataset, IHqlExpression * newDataset);
 extern HQL_API IHqlExpression * updateChildSelectors(IHqlExpression * expr, IHqlExpression * oldSelector, IHqlExpression * newSelector, unsigned firstChild);
 extern HQL_API IHqlExpression * updateMappedFields(IHqlExpression * expr, IHqlExpression * oldRecord, IHqlExpression * newSelector, unsigned firstChild);
-//////extern HQL_API void replaceSelectors(HqlExprArray & out, unsigned first, IHqlExpression * oldDataset, IHqlExpression * newDataset);
+extern HQL_API void replaceSelectors(HqlExprArray & out, unsigned first, IHqlExpression * oldDataset, IHqlExpression * newDataset);
 extern HQL_API IHqlExpression * scopedReplaceSelector(IHqlExpression * expr, IHqlExpression * oldDataset, IHqlExpression * newDataset);
 extern HQL_API IHqlExpression * replaceSelfRefSelector(IHqlExpression * expr, IHqlExpression * newDataset);