Skip to content

Commit

Permalink
fix(build): add a patch to support build on GCC 11+
Browse files Browse the repository at this point in the history
Signed-off-by: NaturalSelect <2145973003@qq.com>

The solution is from apache/brpc#1784 and apache/brpc#1783, and the 2
pull requests were merged into brpc master. So we can remove the patch
when our brpc up-to-date.
  • Loading branch information
NaturalSelect authored and wu-hanqing committed Jul 26, 2023
1 parent b2c1df6 commit b71f944
Show file tree
Hide file tree
Showing 4 changed files with 466 additions and 2 deletions.
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ git_repository(
name = "com_github_brpc_brpc",
remote = "https://github.com/apache/incubator-brpc",
commit = "1b9e00641cbec1c8803da6a1f7f555398c954cb0",
patches = ["//:thirdparties/brpc/brpc.patch"],
patches = ["//:thirdparties/brpc/brpc.patch","//:thirdparties/brpc/fix-gcc11.patch"],
patch_args = ["-p1"],
)

Expand Down
2 changes: 1 addition & 1 deletion curvefs/src/metaserver/copyset/copyset_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ inline std::string CopysetNode::GetCopysetDataDir() const {
}

inline uint64_t CopysetNode::GetAppliedIndex() const {
return appliedIndex_.load(std::memory_order_acq_rel);
return appliedIndex_.load(std::memory_order::memory_order_acquire);
}

inline void CopysetNode::GetStatus(braft::NodeStatus* status) {
Expand Down
1 change: 1 addition & 0 deletions curvefs/test/metaserver/storage/dumpfile_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <memory>
#include <thread>
#include <unordered_map>
#include <array>

#include "curvefs/src/common/process.h"
#include "curvefs/src/metaserver/storage/iterator.h"
Expand Down
Loading

0 comments on commit b71f944

Please sign in to comment.