You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/06/25 18:38:49 UTC
[arrow] branch master updated: ARROW-5723:[C++][Arrow] Fix crossbow
failure
This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 62cd352 ARROW-5723:[C++][Arrow] Fix crossbow failure
62cd352 is described below
commit 62cd35290b03eb40bec67519c638a1211e1ef536
Author: Praveen <pr...@dremio.com>
AuthorDate: Tue Jun 25 13:38:40 2019 -0500
ARROW-5723:[C++][Arrow] Fix crossbow failure
Refactor code to compile in the devtoolset compiler.
Author: Praveen <pr...@dremio.com>
Closes #4688 from praveenbingo/ARROW-5723 and squashes the following commits:
229681f15 <Praveen> ARROW-5723:
---
cpp/src/arrow/result-test.cc | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/cpp/src/arrow/result-test.cc b/cpp/src/arrow/result-test.cc
index 36a7c8d..92a2cde 100644
--- a/cpp/src/arrow/result-test.cc
+++ b/cpp/src/arrow/result-test.cc
@@ -230,7 +230,8 @@ TYPED_TEST(ResultTest, CopyConstructorNonOkStatus) {
// Verify that Result can be copy-constructed from a Result with an ok
// status.
TYPED_TEST(ResultTest, CopyConstructorOkStatus) {
- Result<typename TypeParam::value_type> result1((TypeParam()()));
+ typename TypeParam::value_type value = TypeParam()();
+ Result<typename TypeParam::value_type> result1(value);
Result<typename TypeParam::value_type> result2(result1);
EXPECT_EQ(result1.ok(), result2.ok());
@@ -243,7 +244,8 @@ TYPED_TEST(ResultTest, CopyConstructorOkStatus) {
// expected.
TYPED_TEST(ResultTest, CopyAssignmentNonOkStatus) {
Result<typename TypeParam::value_type> result1(Status(kErrorCode, kErrorMessage));
- Result<typename TypeParam::value_type> result2((TypeParam()()));
+ typename TypeParam::value_type value = TypeParam()();
+ Result<typename TypeParam::value_type> result2(value);
// Invoke the copy-assignment operator.
result2 = result1;
@@ -254,7 +256,8 @@ TYPED_TEST(ResultTest, CopyAssignmentNonOkStatus) {
// Verify that copy-assignment of a Result with an ok status is working as
// expected.
TYPED_TEST(ResultTest, CopyAssignmentOkStatus) {
- Result<typename TypeParam::value_type> result1((TypeParam()()));
+ typename TypeParam::value_type value = TypeParam()();
+ Result<typename TypeParam::value_type> result1(value);
Result<typename TypeParam::value_type> result2(Status(kErrorCode, kErrorMessage));
// Invoke the copy-assignment operator.
@@ -325,7 +328,8 @@ TYPED_TEST(ResultTest, MoveConstructorOkStatus) {
TYPED_TEST(ResultTest, MoveAssignmentOperatorNonOkStatus) {
Status status(kErrorCode, kErrorMessage);
Result<typename TypeParam::value_type> result1(status);
- Result<typename TypeParam::value_type> result2((TypeParam()()));
+ typename TypeParam::value_type value = TypeParam()();
+ Result<typename TypeParam::value_type> result2(value);
// Invoke the move-assignment operator.
result2 = std::move(result1);