diff options
author | zverevgeny <[email protected]> | 2023-09-01 15:45:38 +0300 |
---|---|---|
committer | zverevgeny <[email protected]> | 2023-09-01 16:53:34 +0300 |
commit | 82fd82a4e523a9eaca2e3ed7189d463dd2cc73c0 (patch) | |
tree | 2abc2343419091faba9079b81ee3b99f3be8587d | |
parent | 11c90944b3271b1433532bbb339753d62b15d324 (diff) |
fix build on win, unqualified friend class declaration
4 files changed, 5 insertions, 4 deletions
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_apply.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_apply.cpp index 9cdac227e22..4f0c2dec4c1 100644 --- a/ydb/library/yql/minikql/comp_nodes/mkql_apply.cpp +++ b/ydb/library/yql/minikql/comp_nodes/mkql_apply.cpp @@ -14,7 +14,6 @@ namespace NMiniKQL { namespace { class TApplyWrapper: public TMutableCodegeneratorPtrNode<TApplyWrapper> { -friend class TArrowNode; typedef TMutableCodegeneratorPtrNode<TApplyWrapper> TBaseComputation; public: struct TKernelState : public arrow::compute::KernelState { @@ -89,6 +88,7 @@ public: const std::vector<arrow::ValueDescr> ArgsValuesDescr_; arrow::compute::ScalarKernel Kernel_; }; + friend class TArrowNode; TApplyWrapper(TComputationMutables& mutables, EValueRepresentation kind, IComputationNode* callableNode, TComputationNodePtrVector&& argNodes, ui32 usedArgs, const NUdf::TSourcePosition& pos, TCallableType* callableType) diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp index f4da98355ca..8fda91715d1 100644 --- a/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp +++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_if.cpp @@ -15,7 +15,6 @@ namespace NMiniKQL { namespace { class TBlockIfScalarWrapper : public TMutableComputationNode<TBlockIfScalarWrapper> { -friend class TArrowNode; public: class TArrowNode : public IArrowKernelComputationNode { public: @@ -61,6 +60,7 @@ public: const std::vector<arrow::ValueDescr> ArgsValuesDescr_; arrow::compute::ScalarKernel Kernel_; }; + friend class TArrowNode; TBlockIfScalarWrapper(TComputationMutables& mutables, IComputationNode* pred, IComputationNode* thenNode, IComputationNode* elseNode, TType* resultType, bool thenIsScalar, bool elseIsScalar, const TVector<TType*>& argsTypes) diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_scalar_apply.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_scalar_apply.cpp index ad2907bc24f..aef2da5fe89 100644 --- a/ydb/library/yql/minikql/comp_nodes/mkql_scalar_apply.cpp +++ b/ydb/library/yql/minikql/comp_nodes/mkql_scalar_apply.cpp @@ -17,7 +17,6 @@ namespace NMiniKQL { namespace { class TScalarApplyWrapper : public TMutableComputationNode<TScalarApplyWrapper> { -friend class TArrowNode; public: struct TAccessors { TAccessors(const TVector<TType*>& argsTypes, TType* returnType, const NUdf::IPgBuilder& pgBuilder) @@ -124,6 +123,7 @@ public: const std::vector<arrow::ValueDescr> ArgsValuesDescr_; arrow::compute::ScalarKernel Kernel_; }; + friend class TArrowNode; TScalarApplyWrapper(TComputationMutables& mutables, const TVector<TType*>& argsTypes, TType* returnType, TVector<IComputationNode*>&& args, TVector<IComputationExternalNode*>&& lambdaArgs, IComputationNode* lambdaRoot) diff --git a/ydb/library/yql/minikql/computation/mkql_block_impl.h b/ydb/library/yql/minikql/computation/mkql_block_impl.h index a0cdcd73e1a..7f7f0015514 100644 --- a/ydb/library/yql/minikql/computation/mkql_block_impl.h +++ b/ydb/library/yql/minikql/computation/mkql_block_impl.h @@ -24,7 +24,7 @@ std::vector<arrow::compute::InputType> ConvertToInputTypes(const TVector<TType*> arrow::compute::OutputType ConvertToOutputType(TType* output); class TBlockFuncNode : public TMutableComputationNode<TBlockFuncNode> { -friend class TArrowNode; + public: TBlockFuncNode(TComputationMutables& mutables, TStringBuf name, TVector<IComputationNode*>&& argsNodes, const TVector<TType*>& argsTypes, const arrow::compute::ScalarKernel& kernel, @@ -44,6 +44,7 @@ private: private: const TBlockFuncNode* Parent_; }; + friend class TArrowNode; struct TState : public TComputationValue<TState> { using TComputationValue::TComputationValue; |