You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jh...@apache.org on 2018/06/07 18:16:46 UTC
hadoop git commit: HDFS-13534. libhdfs++: Fix GCC7 build. Contributed
by James Clampffer.
Repository: hadoop
Updated Branches:
refs/heads/trunk 377ea1bcd -> b79ae5d93
HDFS-13534. libhdfs++: Fix GCC7 build. Contributed by James Clampffer.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b79ae5d9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b79ae5d9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b79ae5d9
Branch: refs/heads/trunk
Commit: b79ae5d93d71f14a052ce4e54d0215a74a4b4266
Parents: 377ea1b
Author: James Clampffer <jh...@apache.org>
Authored: Thu Jun 7 14:16:17 2018 -0400
Committer: James Clampffer <jh...@apache.org>
Committed: Thu Jun 7 14:16:17 2018 -0400
----------------------------------------------------------------------
.../src/main/native/libhdfspp/include/hdfspp/ioservice.h | 1 +
.../src/main/native/libhdfspp/lib/reader/datatransfer.h | 2 +-
.../src/main/native/libhdfspp/tests/mock_connection.h | 2 +-
.../src/main/native/libhdfspp/tests/remote_block_reader_test.cc | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b79ae5d9/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/ioservice.h
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/ioservice.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/ioservice.h
index 9805bad..a6ec97a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/ioservice.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/ioservice.h
@@ -58,6 +58,7 @@
#ifndef INCLUDE_HDFSPP_IOSERVICE_H_
#define INCLUDE_HDFSPP_IOSERVICE_H_
+#include <functional>
#include <memory>
// forward decl
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b79ae5d9/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/datatransfer.h
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/datatransfer.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/datatransfer.h
index 2b36f59..ea17653 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/datatransfer.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/datatransfer.h
@@ -59,7 +59,7 @@ public:
void Connect(std::function<void(Status status, std::shared_ptr<DataNodeConnection> dn)> handler) override
{(void)handler; /*TODO: Handshaking goes here*/};
- void Cancel();
+ void Cancel() override;
private:
DataTransferSaslStream(const DataTransferSaslStream &) = delete;
DataTransferSaslStream &operator=(const DataTransferSaslStream &) = delete;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b79ae5d9/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/mock_connection.h
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/mock_connection.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/mock_connection.h
index de234ef..82db760 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/mock_connection.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/mock_connection.h
@@ -87,7 +87,7 @@ public:
virtual void cancel() {}
virtual void close() {}
protected:
- virtual ProducerResult Produce() = 0;
+ ProducerResult Produce() override = 0;
::asio::io_service *io_service_;
private:
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b79ae5d9/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/remote_block_reader_test.cc
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/remote_block_reader_test.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/remote_block_reader_test.cc
index 4b909b2..3997e64 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/remote_block_reader_test.cc
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/remote_block_reader_test.cc
@@ -82,7 +82,7 @@ public:
this->MockConnectionBase::async_write_some(buf, handler);
}
- void Cancel() {
+ void Cancel() override {
/* no-op, declared pure virtual */
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org