From 7f2f56633c7f6cf1beac967346b82a565dc6dff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gin=C3=A9s=20Hidalgo?= Date: Thu, 21 Oct 2021 19:13:28 -0400 Subject: [PATCH] Fixed implicit conversion warnings (#9481) --- .../core/providers/cpu/math/element_wise_ops.cc | 6 +++--- onnxruntime/core/providers/cpu/tensor/where_op.cc | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/onnxruntime/core/providers/cpu/math/element_wise_ops.cc b/onnxruntime/core/providers/cpu/math/element_wise_ops.cc index bfc6388954..3403023608 100644 --- a/onnxruntime/core/providers/cpu/math/element_wise_ops.cc +++ b/onnxruntime/core/providers/cpu/math/element_wise_ops.cc @@ -1088,7 +1088,7 @@ template Status BitShift::Compute(OpKernelContext* context) const { ProcessBroadcastSpanFuncs funcs{ [](BroadcastHelper& per_iter_bh) { - bool shift_left = per_iter_bh.GetUserData(); + bool shift_left = (per_iter_bh.GetUserData() != nullptr); const T& input0 = per_iter_bh.ScalarInput0(); ConstEigenVectorMap input1 = per_iter_bh.EigenInput1(); EigenVectorMap output = per_iter_bh.OutputEigen(); @@ -1104,7 +1104,7 @@ Status BitShift::Compute(OpKernelContext* context) const { } }, [](BroadcastHelper& per_iter_bh) { - bool shift_left = per_iter_bh.GetUserData(); + bool shift_left = (per_iter_bh.GetUserData() != nullptr); auto input0 = per_iter_bh.EigenInput0(); const T& input1 = per_iter_bh.ScalarInput1(); auto output = per_iter_bh.OutputEigen(); @@ -1120,7 +1120,7 @@ Status BitShift::Compute(OpKernelContext* context) const { } }, [](BroadcastHelper& per_iter_bh) { - bool shift_left = per_iter_bh.GetUserData(); + bool shift_left = (per_iter_bh.GetUserData() != nullptr); auto input0 = per_iter_bh.EigenInput0(); auto input1 = per_iter_bh.EigenInput1(); auto output = per_iter_bh.OutputEigen(); diff --git a/onnxruntime/core/providers/cpu/tensor/where_op.cc b/onnxruntime/core/providers/cpu/tensor/where_op.cc index f57b9ba086..ad789d3d4e 100644 --- a/onnxruntime/core/providers/cpu/tensor/where_op.cc +++ b/onnxruntime/core/providers/cpu/tensor/where_op.cc @@ -52,7 +52,7 @@ template ProcessBroadcastSpanFuncs CreateScalarBroadcastFuncs() { return ProcessBroadcastSpanFuncs{ [](BroadcastHelper& per_iter_bh) { - bool target = per_iter_bh.GetUserData(); + bool target = (per_iter_bh.GetUserData() != nullptr); bool condition = per_iter_bh.ScalarInput0(); auto value = per_iter_bh.EigenInput1(); auto output = per_iter_bh.OutputEigen(); @@ -63,7 +63,7 @@ ProcessBroadcastSpanFuncs CreateScalarBroadcastFuncs() { } }, [](BroadcastHelper& per_iter_bh) { - bool target = per_iter_bh.GetUserData(); + bool target = (per_iter_bh.GetUserData() != nullptr); auto condition = per_iter_bh.EigenInput0(); const T& value = per_iter_bh.ScalarInput1(); auto output = per_iter_bh.OutputEigen(); @@ -71,7 +71,7 @@ ProcessBroadcastSpanFuncs CreateScalarBroadcastFuncs() { .select(value, EigenVectorMap::PlainObject::Constant(condition.size(), T{})); }, [](BroadcastHelper& per_iter_bh) { - bool target = per_iter_bh.GetUserData(); + bool target = (per_iter_bh.GetUserData() != nullptr); auto condition = per_iter_bh.EigenInput0(); auto value = per_iter_bh.EigenInput1(); auto output = per_iter_bh.OutputEigen(); @@ -84,7 +84,7 @@ template ProcessBroadcastSpanFuncs CreateNonScalarBroadcastFuncs() { return ProcessBroadcastSpanFuncs{ [](BroadcastHelper& per_iter_bh) { - bool target = per_iter_bh.GetUserData(); + bool target = (per_iter_bh.GetUserData() != nullptr); bool condition = per_iter_bh.ScalarInput0(); auto value = per_iter_bh.SpanInput1(); auto output = per_iter_bh.OutputSpan(); @@ -95,7 +95,7 @@ ProcessBroadcastSpanFuncs CreateNonScalarBroadcastFuncs() { } }, [](BroadcastHelper& per_iter_bh) { - bool target = per_iter_bh.GetUserData(); + bool target = (per_iter_bh.GetUserData() != nullptr); auto condition = per_iter_bh.SpanInput0(); const T& value = per_iter_bh.ScalarInput1(); auto output = per_iter_bh.OutputSpan(); @@ -105,7 +105,7 @@ ProcessBroadcastSpanFuncs CreateNonScalarBroadcastFuncs() { }); }, [](BroadcastHelper& per_iter_bh) { - bool target = per_iter_bh.GetUserData(); + bool target = (per_iter_bh.GetUserData() != nullptr); auto condition = per_iter_bh.SpanInput0(); auto value = per_iter_bh.SpanInput1(); auto output = per_iter_bh.OutputSpan();