This is an automated email from the ASF dual-hosted git repository.
alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new 9aa17addd [client] remove C++11 extensions from exported header
9aa17addd is described below
commit 9aa17addd132956a2a09bf522aa5d565a4098775
Author: Alexey Serbin <[email protected]>
AuthorDate: Wed Jul 20 15:56:51 2022 -0700
[client] remove C++11 extensions from exported header
Changelist 708fdff19 included updates to the exported C++ header
write_op.h. The C++ client API is still kept C++98 compliant,
so C++11 extensions should not be present.
This patch reverts the changes in src/kudu/client/write_op.h
that 708fdff19 introduced.
This is a follow-up to 708fdff19073dbe9dc4eb9492551443aa38111f9.
Change-Id: I042ccaa76e424475dd2347505a611cdcab5c21d3
Reviewed-on: http://gerrit.cloudera.org:8080/18764
Tested-by: Alexey Serbin <[email protected]>
Reviewed-by: Attila Bukor <[email protected]>
---
src/kudu/client/write_op.h | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/kudu/client/write_op.h b/src/kudu/client/write_op.h
index e5b76488e..a1e9e30a6 100644
--- a/src/kudu/client/write_op.h
+++ b/src/kudu/client/write_op.h
@@ -30,6 +30,7 @@
#ifdef KUDU_HEADERS_NO_STUBS
#include "kudu/gutil/macros.h"
+#include "kudu/gutil/port.h"
#else
#include "kudu/client/stubs.h"
#endif
@@ -140,16 +141,16 @@ class KUDU_EXPORT KuduWriteOperation {
/// columns which do not have default values.
class KUDU_EXPORT KuduInsert : public KuduWriteOperation {
public:
- ~KuduInsert() override;
+ virtual ~KuduInsert();
/// @copydoc KuduWriteOperation::ToString()
- std::string ToString() const override { return "INSERT " + row_.ToString(); }
+ virtual std::string ToString() const OVERRIDE { return "INSERT " +
row_.ToString(); }
protected:
/// @cond PROTECTED_MEMBERS_DOCUMENTED
/// @copydoc KuduWriteOperation::type()
- Type type() const override {
+ virtual Type type() const OVERRIDE {
return INSERT;
}
@@ -167,16 +168,16 @@ class KUDU_EXPORT KuduInsert : public KuduWriteOperation {
/// columns which do not have default values.
class KUDU_EXPORT KuduInsertIgnore : public KuduWriteOperation {
public:
- ~KuduInsertIgnore() override;
+ virtual ~KuduInsertIgnore();
/// @copydoc KuduWriteOperation::ToString()
- std::string ToString() const override { return "INSERT IGNORE " +
row_.ToString(); }
+ virtual std::string ToString() const OVERRIDE { return "INSERT IGNORE " +
row_.ToString(); }
protected:
/// @cond PROTECTED_MEMBERS_DOCUMENTED
/// @copydoc KuduWriteOperation::type()
- Type type() const override {
+ virtual Type type() const OVERRIDE {
return INSERT_IGNORE;
}
@@ -193,16 +194,16 @@ class KUDU_EXPORT KuduInsertIgnore : public
KuduWriteOperation {
/// See KuduInsert for more details.
class KUDU_EXPORT KuduUpsert : public KuduWriteOperation {
public:
- ~KuduUpsert() override;
+ virtual ~KuduUpsert();
/// @copydoc KuduWriteOperation::ToString()
- std::string ToString() const override { return "UPSERT " + row_.ToString(); }
+ virtual std::string ToString() const OVERRIDE { return "UPSERT " +
row_.ToString(); }
protected:
/// @cond PROTECTED_MEMBERS_DOCUMENTED
/// @copydoc KuduWriteOperation::type()
- Type type() const override {
+ virtual Type type() const OVERRIDE {
return UPSERT;
}
@@ -220,16 +221,16 @@ class KUDU_EXPORT KuduUpsert : public KuduWriteOperation {
/// in the schema to be set in the embedded KuduPartialRow object.
class KUDU_EXPORT KuduUpdate : public KuduWriteOperation {
public:
- ~KuduUpdate() override;
+ virtual ~KuduUpdate();
/// @copydoc KuduWriteOperation::ToString()
- std::string ToString() const override { return "UPDATE " + row_.ToString(); }
+ virtual std::string ToString() const OVERRIDE { return "UPDATE " +
row_.ToString(); }
protected:
/// @cond PROTECTED_MEMBERS_DOCUMENTED
/// @copydoc KuduWriteOperation::type()
- Type type() const override {
+ virtual Type type() const OVERRIDE {
return UPDATE;
}
@@ -246,16 +247,16 @@ class KUDU_EXPORT KuduUpdate : public KuduWriteOperation {
/// in the schema to be set in the embedded KuduPartialRow object.
class KUDU_EXPORT KuduUpdateIgnore : public KuduWriteOperation {
public:
- ~KuduUpdateIgnore() override;
+ virtual ~KuduUpdateIgnore();
/// @copydoc KuduWriteOperation::ToString()
- std::string ToString() const override { return "UPDATE IGNORE " +
row_.ToString(); }
+ virtual std::string ToString() const OVERRIDE { return "UPDATE IGNORE " +
row_.ToString(); }
protected:
/// @cond PROTECTED_MEMBERS_DOCUMENTED
/// @copydoc KuduWriteOperation::type()
- Type type() const override {
+ virtual Type type() const OVERRIDE {
return UPDATE_IGNORE;
}
@@ -272,16 +273,16 @@ private:
/// KuduPartialRow object.
class KUDU_EXPORT KuduDelete : public KuduWriteOperation {
public:
- ~KuduDelete() override;
+ virtual ~KuduDelete();
/// @copydoc KuduWriteOperation::ToString()
- std::string ToString() const override { return "DELETE " + row_.ToString(); }
+ virtual std::string ToString() const OVERRIDE { return "DELETE " +
row_.ToString(); }
protected:
/// @cond PROTECTED_MEMBERS_DOCUMENTED
/// @copydoc KuduWriteOperation::type()
- Type type() const override {
+ virtual Type type() const OVERRIDE {
return DELETE;
}
@@ -298,16 +299,16 @@ class KUDU_EXPORT KuduDelete : public KuduWriteOperation {
/// KuduPartialRow object.
class KUDU_EXPORT KuduDeleteIgnore : public KuduWriteOperation {
public:
- ~KuduDeleteIgnore() override;
+ virtual ~KuduDeleteIgnore();
/// @copydoc KuduWriteOperation::ToString()
- std::string ToString() const override { return "DELETE IGNORE " +
row_.ToString(); }
+ virtual std::string ToString() const OVERRIDE { return "DELETE IGNORE " +
row_.ToString(); }
protected:
/// @cond PROTECTED_MEMBERS_DOCUMENTED
/// @copydoc KuduWriteOperation::type()
- Type type() const override {
+ virtual Type type() const OVERRIDE {
return DELETE_IGNORE;
}
