Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-15232. Fix libhdfspp test failures with GCC 7. (#1906) 

(cherry picked from commit f59f6891c8)
This commit is contained in:
Akira Ajisaka 2020-03-24 11:36:14 +09:00
parent 1d55e1e229
commit 1bbbef38d0
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/gmock-1.7.0/gmock/gmock.h vendored
View File

@ -9930,6 +9930,8 @@ class ActionResultHolder : public UntypedActionResultHolderBase {
template <> template <>
class ActionResultHolder<void> : public UntypedActionResultHolderBase { class ActionResultHolder<void> : public UntypedActionResultHolderBase {
public: public:
explicit ActionResultHolder() {}
void GetValueAndDelete() const { delete this; } void GetValueAndDelete() const { delete this; }
virtual void PrintAsActionResult(::std::ostream* /* os */) const {} virtual void PrintAsActionResult(::std::ostream* /* os */) const {}
@ -9941,7 +9943,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
const typename Function<F>::ArgumentTuple& args, const typename Function<F>::ArgumentTuple& args,
const string& call_description) { const string& call_description) {
func_mocker->PerformDefaultAction(args, call_description); func_mocker->PerformDefaultAction(args, call_description);
return NULL; return new ActionResultHolder();
} }
// Performs the given action and returns NULL. // Performs the given action and returns NULL.
@ -9950,7 +9952,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
const Action<F>& action, const Action<F>& action,
const typename Function<F>::ArgumentTuple& args) { const typename Function<F>::ArgumentTuple& args) {
action.Perform(args); action.Perform(args);
return NULL; return new ActionResultHolder();
} }
}; };